updated: xorg-x11-xinit, xorg-x11-apps

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

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

@@ -6,7 +6,7 @@ Name: xorg-x11-%{pkgname}
 # NOTE: The package version should be set to the X11 major release from which
 # the OS release is based upon.
 Version: 7.5
-Release: 1%{?_dist_release}
+Release: 2%{?_dist_release}
 License: MIT/X11
 Group: User Interface/X
 URL: http://www.x.org
@@ -19,19 +19,20 @@ Source2:  ftp://ftp.x.org/pub/individual/app/xwd-1.0.3.tar.bz2
 Source3:  ftp://ftp.x.org/pub/individual/app/xwud-1.0.2.tar.bz2
 Source4:  ftp://ftp.x.org/pub/individual/app/xpr-1.0.3.tar.bz2
 # Miscellaneous other applications
-Source5:  ftp://ftp.x.org/pub/individual/app/luit-1.0.4.tar.bz2
+Source5:  ftp://ftp.x.org/pub/individual/app/luit-1.0.5.tar.bz2
 Source6:  ftp://ftp.x.org/pub/individual/app/x11perf-1.5.1.tar.bz2
 Source7:  ftp://ftp.x.org/pub/individual/app/xbiff-1.0.1.tar.bz2
 Source8:  ftp://ftp.x.org/pub/individual/app/xclipboard-1.1.0.tar.bz2
 Source9:  ftp://ftp.x.org/pub/individual/app/xconsole-1.0.3.tar.bz2
 Source10: ftp://ftp.x.org/pub/individual/app/xcursorgen-1.0.3.tar.bz2
-Source11: ftp://ftp.x.org/pub/individual/app/xeyes-1.0.991.tar.bz2
+Source11: ftp://ftp.x.org/pub/individual/app/xeyes-1.1.0.tar.bz2
 Source12: ftp://ftp.x.org/pub/individual/app/xkill-1.0.2.tar.bz2
 Source13: ftp://ftp.x.org/pub/individual/app/xload-1.0.2.tar.bz2
-Source14: ftp://ftp.x.org/pub/individual/app/xlogo-1.0.1.tar.bz2
+Source14: ftp://ftp.x.org/pub/individual/app/xlogo-1.0.2.tar.bz2
 Source15: ftp://ftp.x.org/pub/individual/app/xmag-1.0.3.tar.bz2
-Source16: ftp://ftp.x.org/pub/individual/app/xmessage-1.0.2.tar.bz2
-Source17: ftp://ftp.x.org/pub/individual/app/xinput-1.5.0.tar.bz2
+Source16: ftp://ftp.x.org/pub/individual/app/xmessage-1.0.3.tar.bz2
+Source17: ftp://ftp.x.org/pub/individual/app/xinput-1.5.1.tar.bz2
+Source18: ftp://ftp.x.org/pub/individual/app/xcalc-1.0.3.tar.bz2
 
 Patch2: xconsole-1.0.3-streams-me-softer.patch
 
@@ -58,7 +59,7 @@ BuildRequires: libXfixes-devel
 Requires(pre): xorg-x11-filesystem
 
 Provides: luit oclock x11perf xbiff xclipboard xclock xconsole xcursorgen
-Provides: xeyes xkill xload xlogo xmag xmessage xpr xwd xwud xinput
+Provides: xeyes xkill xload xlogo xmag xmessage xpr xwd xwud xinput xcalc
 
 # NOTE: xwd, xwud, luit used to be in these.
 Obsoletes: XFree86, XOrg
@@ -70,7 +71,7 @@ Obsoletes: XFree86-tools, XOrg-tools
 A collection of common X Window System applications.
 
 %prep
-%setup -q -c %{name}-%{version} -a1 -a2 -a3 -a4 -a5 -a6 -a7 -a8 -a9 -a10 -a11 -a12 -a13 -a14 -a15 -a16 -a17
+%setup -q -c %{name}-%{version} -a1 -a2 -a3 -a4 -a5 -a6 -a7 -a8 -a9 -a10 -a11 -a12 -a13 -a14 -a15 -a16 -a17 -a18
 %patch2 -p0 -b .streams-me-softer
 
 %build
@@ -116,6 +117,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/x11perf
 %{_bindir}/x11perfcomp
 %{_bindir}/xbiff
+%{_bindir}/xcalc
 %{_bindir}/xclipboard
 %{_bindir}/xclock
 %{_bindir}/xconsole
@@ -134,6 +136,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/xwud
 %dir %{_datadir}/X11
 %{_datadir}/X11/app-defaults/Clock-color
+%{_datadir}/X11/app-defaults/XCalc
+%{_datadir}/X11/app-defaults/XCalc-color
 %{_datadir}/X11/app-defaults/XClipboard
 %{_datadir}/X11/app-defaults/XClock
 %{_datadir}/X11/app-defaults/XClock-color
@@ -157,6 +161,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/x11perf.1*
 %{_mandir}/man1/x11perfcomp.1*
 %{_mandir}/man1/xbiff.1*
+%{_mandir}/man1/xcalc.1*
 %{_mandir}/man1/xclipboard.1*
 %{_mandir}/man1/xclock.1*
 %{_mandir}/man1/xconsole.1*
@@ -174,6 +179,15 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/xwud.1*
 
 %changelog
+* Fri Mar 26 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 7.5-2
+- luit-1.0.5
+- xbiff-1.0.2
+- xeyes-1.1.0
+- xlogo-1.0.2
+- xmessage-1.0.3
+- xinput-1.5.1
+- added xcalc-1.0.3 <wishes:161>
+
 * Thu Nov 19 2009 Daisuke SUZUKI <daisuke@linux.or.jp> 7.5-1
 - xclock-1.0.4
 - xwd-1.0.3

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

@@ -1,9 +1,9 @@
 %define pkgname xinit
 
-Summary:   X.Org X11 X Window System xinit startup scripts
-Summary(ja):   X.Org X11 X ウィンドウシステム xinit スタートアップスクリプト
+Summary:     X.Org X11 X Window System xinit startup scripts
+Summary(ja): X.Org X11 X ウィンドウシステム xinit スタートアップスクリプト
 Name:      xorg-x11-%{pkgname}
-Version:   1.2.0
+Version:   1.2.1
 Release:   1%{?_dist_release}
 License:   MIT/X11
 Group:     User Interface/X
@@ -19,9 +19,12 @@ Source14: Xresources
 #       here instead of the xdm package.
 Source16: Xsession
 Source17: localuser.sh
+Source18: xinit-compat.desktop
 Source100: ck-xinit-session.c
 
 Patch1: xinit-1.0.2-client-session.patch
+Patch2: xinit-1.0.7-poke-ck.patch
+Patch3: xinit-1.0.9-unset.patch
 
 Patch10: xinit-1.0.7-vine.patch
 
@@ -32,6 +35,7 @@ BuildRequires: ConsoleKit-devel
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: libtool
+BuildRequires: dbus-devel
 BuildRequires: xorg-x11-util-macros
 # NOTE: startx needs xauth in order to run, but that is not picked up
 #       automatically by rpm.  (Bug #173684)
@@ -59,9 +63,21 @@ X.Org X11 X Window System xinit startup scripts
 %description -l ja
 X.Org X11 X Window System の xinit スタートアップ・スクリプト
 
+%package session
+Summary: Display manager support for ~/.xsession and ~/.Xclients
+Group: User Interface/X
+
+%description
+X.Org X11 X Window System xinit startup scripts
+
+%description session
+Allows legacy ~/.xsession and ~/.Xclients files to be used from display managers
+
 %prep
 %setup -q -n %{pkgname}-%{version}
 %patch1 -p1 -b .client-session
+#%patch2 -p1 -b .poke-ck
+%patch3 -p1 -b .unset
 %patch10 -p1 -b .vine
 
 %build
@@ -71,9 +87,9 @@ autoreconf -i
 # Makefile.am and submit it in a bug report or check into CVS.
 make XINITDIR=/etc/X11/xinit
 %{__cc} -o ck-xinit-session \
-	`pkg-config --cflags ck-connector` $RPM_OPT_FLAGS \
+	`pkg-config --cflags ck-connector dbus-1` $RPM_OPT_FLAGS \
 	$RPM_SOURCE_DIR/ck-xinit-session.c \
-	`pkg-config --libs ck-connector`
+	`pkg-config --libs ck-connector dbus-1`
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -81,10 +97,13 @@ rm -rf $RPM_BUILD_ROOT
 # Makefile.am and submit it in a bug report or check into CVS.
 %makeinstall XINITDIR=$RPM_BUILD_ROOT/etc/X11/xinit
 install -m755 ck-xinit-session $RPM_BUILD_ROOT/%{_bindir}
+install -m644 -D $RPM_SOURCE_DIR/xinit-compat.desktop $RPM_BUILD_ROOT%{_datadir}/xsessions/xinit-compat.desktop
 
 # Install custom xinitrc, etc.
 {
-    for script in %{SOURCE10} %{SOURCE11} %{SOURCE12} %{SOURCE16} ; do
+    install -m 644 %{SOURCE10} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinitrc-common
+
+    for script in %{SOURCE11} %{SOURCE12} %{SOURCE16} ; do
         install -m 755 $script $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/${script##*/}
     done
 
@@ -102,7 +121,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING README NEWS ChangeLog
+%doc COPYING README ChangeLog
 %{_bindir}/startx
 %{_bindir}/xinit
 %{_bindir}/ck-xinit-session
@@ -121,7 +140,18 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/startx.1*
 %{_mandir}/man1/xinit.1*
 
+%files session
+%defattr(-, root, root)
+%{_datadir}/xsessions/xinit-compat.desktop
+
 %changelog
+* Fri Mar 26 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 1.2.1-1
+- new upstream release
+- updated SOURCE12, SOURCE100
+- Install xinitrc-common non-executable.
+- added a new subpackage to add ~/.xsessions and ~/.Xclients 
+  to session list
+
 * Thu Nov 19 2009 Daisuke SUZUKI <daisuke@linux.or.jp> 1.2.0-1
 - new upstream release