Author: baggins Date: Thu Jul 28 16:45:56 2011 GMT Module: packages Tag: HEAD ---- Log message: - rel 2 - drop xinitrc package, just require xinitrc-ng
---- Files affected: packages/xorg-app-xinit: xorg-app-xinit.spec (1.30 -> 1.31) ---- Diffs: ================================================================ Index: packages/xorg-app-xinit/xorg-app-xinit.spec diff -u packages/xorg-app-xinit/xorg-app-xinit.spec:1.30 packages/xorg-app-xinit/xorg-app-xinit.spec:1.31 --- packages/xorg-app-xinit/xorg-app-xinit.spec:1.30 Mon Jul 25 20:38:20 2011 +++ packages/xorg-app-xinit/xorg-app-xinit.spec Thu Jul 28 18:45:51 2011 @@ -1,13 +1,9 @@ # $Revision$, $Date$ -# FIXME: -# - make it compatible with xinitrc-ng -# for example: /etc/X11/kdm/Xsession: line 42: exec: /etc/X11/xinit/Xclients: cannot execute: No such file or directory -# Summary: xinit application - X Window System initializer Summary(pl.UTF-8): Aplikacja xinit do uruchamiania X Window System Name: xorg-app-xinit Version: 1.3.1 -Release: 1 +Release: 2 License: MIT Group: X11/Applications Source0: http://xorg.freedesktop.org/releases/individual/app/xinit-%{version}.tar.bz2 @@ -27,7 +23,7 @@ BuildRequires: xorg-lib-libX11-devel BuildRequires: xorg-proto-inputproto-devel BuildRequires: xorg-util-util-macros >= 1.8 -Requires: /etc/X11/xinit/xinitrc +Requires: xinitrc-ng Requires: xorg-app-xauth BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -44,19 +40,6 @@ okienkowych. Po zakończeniu pierwszego klienta xinit zabija serwer X i kończy działanie. -%package xinitrc -Summary: xinitrc script provided by Xorg -Summary(pl.UTF-8): Skrypt xinitrc dostarczany z dystrybucją Xorg -Group: X11 -Provides: xinitrc -Obsoletes: xinitrc - -%description xinitrc -xinitrc script provided by Xorg. - -%description xinitrc -l pl.UTF-8 -Skrypt xinitrc dostarczany z dystrybucją Xorg. - %prep %setup -q -n xinit-%{version} %patch0 -p1 @@ -84,6 +67,8 @@ install -D %{SOURCE3} $RPM_BUILD_ROOT%{_mandir}/it/man1/xinit.1x install -D %{SOURCE4} $RPM_BUILD_ROOT%{_mandir}/pl/man1/xinit.1x +%{__rm} $RPM_BUILD_ROOT/etc/X11/xinit/xinitrc + %clean rm -rf $RPM_BUILD_ROOT @@ -99,19 +84,16 @@ %lang(pl) %{_mandir}/pl/man1/startx.1x* %lang(pl) %{_mandir}/pl/man1/xinit.1x* -%if 0 -# Not finished. see TODO at start of spec -%files xinitrc -%defattr(644,root,root,755) -%attr(755,root,root) /etc/X11/xinit/xinitrc -%endif - %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog * %{date} PLD Team <[email protected]> All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.31 2011/07/28 16:45:51 baggins +- rel 2 +- drop xinitrc package, just require xinitrc-ng + Revision 1.30 2011/07/25 18:38:20 qboosh - updated to 1.3.1 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xorg-app-xinit/xorg-app-xinit.spec?r1=1.30&r2=1.31&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
