fix xorg-x11

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@3757 ec354946-7b23-47d6-9f5a-488ba84defc7

t/task-xorg-x11/task-xorg-x11-vl.spec

@@ -1,8 +1,8 @@
 Summary: Virtual package for X.Org X11
 Summary(ja): X.Org X11 バーチャルパッケージ
 Name: task-xorg-x11
-Version: 7.4
-Release: 2%{?_dist_release}
+Version: 7.6
+Release: 1%{?_dist_release}
 License: GPL
 Group: User Interface/Desktops
 
@@ -43,7 +43,6 @@ Requires: mktcapdir >= 0.6.0
 Requires: twm, xterm
 Requires: mesa-demos
 
-Provides: xorg-x11 = %{version}-%{release}
 Obsoletes: XOrg < 7.0
 
 %description
@@ -55,6 +54,10 @@ X.Org X11 を簡単にインストールするための仮想パッケージで
 %files
 
 %changelog
+* Sun May 01 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 7.6-1
+- bump version to 7.6
+- remove Provides: xorg-x11
+
 * Sun Aug 02 2009 Daisuke SUZUKI <daisuke@linux.or.jp> 7.4-2
 - add twm, xterm, mesa-demos
 - update required version

x/xorg-x11-server-utils/xorg-x11-server-utils-vl.spec

@@ -4,7 +4,7 @@ Summary: X.Org X11 X server utilities
 Summary(ja): X.Org X11 X サーバユーティリティ
 Name: xorg-x11-%{pkgname}
 Version: 7.6
-Release: 2%{?_dist_release}
+Release: 3%{?_dist_release}
 License: MIT/X11
 Group: User Interface/X
 URL: http://www.x.org
@@ -75,7 +75,7 @@ Provides: xsetroot xstdcmap xvidtune
 # xrandr, xrdb, xrefresh, xset, xsetmode, xsetpointer, xsetroot, xstdcmap,
 # xvidtune, were all in xorg-x11 and XFree86 packages, so we obsolete
 # them to ensure upgrades work.
-Obsoletes: xorg-x11, XFree86
+Obsoletes: XFree86
 
 %description
 A collection of utilities used to tweak and query the runtime configuration
@@ -186,6 +186,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/xvidtune.1*
 
 %changelog
+* Sun May 01 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 7.6-3
+- delete Obsoletes: xorg-x11
+
 * Thu Apr 28 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 7.6-2
 - xrdb-1.0.9
   (including security fix for CVE-2011-0465)

x/xorg-x11-xkb-utils/xorg-x11-xkb-utils-vl.spec

@@ -2,7 +2,7 @@ Summary: X.Org X11 xkb utilities
 Summary(ja): X.Org X11 xkb ユーティリティ
 Name: xorg-x11-xkb-utils
 Version: 7.6
-Release: 1%{?_dist_release}
+Release: 2%{?_dist_release}
 License: MIT/X11
 Group: User Interface/X
 URL: http://www.x.org
@@ -26,7 +26,7 @@ BuildRequires: libXpm-devel
 BuildRequires: bison
 BuildRequires: flex
 Provides: setxkbmap, xkbcomp, xkbevd, xkbprint, xkbutils
-Obsoletes: XFree86, xorg-x11
+Obsoletes: XFree86
 
 %description
 X.Org X11 xkb utilities
@@ -74,6 +74,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/xkbwatch.1*
 
 %changelog
+* Sun May 01 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 7.6-2
+- delete Obsoletes: xorg-x11
+
 * Sat Jan 22 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 7.6-1
 - xkbprint-1.0.3
 

x/xorg-x11-xsm/xorg-x11-xsm-vl.spec

@@ -6,7 +6,7 @@ Name: xorg-x11-%{pkgname}
 # NOTE: The Version field should be the version of the xsm tarball.
 Version: 1.0.2
 # Bump the release on rebuilds/bugfixes/etc.
-Release: 3%{?_dist_release}
+Release: 4%{?_dist_release}
 License: MIT
 Group: User Interface/X
 URL: http://www.x.org
@@ -43,7 +43,7 @@ Requires: xauth, rsh
 Provides: xsm, smproxy, rstart, rstartd
 
 # NOTE: xsm, smproxy, rstart used to be part of the XFree86/xorg-x11 package
-Obsoletes: XFree86, xorg-x11
+Obsoletes: XFree86
 
 %description
 X.Org X11 X Session Manager
@@ -131,6 +131,9 @@ rm -rf $RPM_BUILD_ROOT
 %config %{_sysconfdir}/X11/xsm/system.xsm
 
 %changelog
+* Sun Nov 07 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.0.2-4
+- delete Obsoletes: xorg-x11
+
 * Sun Nov 07 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.0.2-3
 - xsm-1.0.2
 - smproxy-1.0.4