diff --git a/xorg-x11-server.changes b/xorg-x11-server.changes index 9d6d9a4..a94955b 100644 --- a/xorg-x11-server.changes +++ b/xorg-x11-server.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Feb 19 11:00:49 CET 2007 - sndirsch@suse.de + +- use global permissions files for SUSE > 10.1 (Bug #246228) + ------------------------------------------------------------------- Thu Feb 1 11:03:39 CET 2007 - sndirsch@suse.de diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index 61eadce..2ccea03 100644 --- a/xorg-x11-server.spec +++ b/xorg-x11-server.spec @@ -21,7 +21,7 @@ BuildRequires: libjpeg-devel URL: http://xorg.freedesktop.org/ %define EXPERIMENTAL 0 Version: 7.2 -Release: 50 +Release: 54 License: X11/MIT BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Servers/XF86_4 @@ -264,6 +264,7 @@ ln -snf ../../../usr/bin/Xorg $RPM_BUILD_ROOT/var/X11R6/bin/X ln -snf ../../var/X11R6/bin/X $RPM_BUILD_ROOT/usr/bin/X mkdir -p $RPM_BUILD_ROOT/usr/%{_lib}/xorg/modules/updates/{fonts,input,linux,drivers,multimedia,extensions} install -m 644 $RPM_SOURCE_DIR/README.updates $RPM_BUILD_ROOT/usr/%{_lib}/xorg/modules/updates +%if %suse_version <= 1010 mkdir -p $RPM_BUILD_ROOT/etc/permissions.d cat > $RPM_BUILD_ROOT/etc/permissions.d/xorg-x11-server.easy << EOF /usr/bin/Xorg root:root 4711 @@ -271,9 +272,10 @@ EOF cat > $RPM_BUILD_ROOT/etc/permissions.d/xorg-x11-server.paranoid << EOF /usr/bin/Xorg root:root 0711 EOF -cat > $RPM_BUILD_ROOT/etc/permissions.d/xorg-x11-server.easy << EOF +cat > $RPM_BUILD_ROOT/etc/permissions.d/xorg-x11-server.secure << EOF /usr/bin/Xorg root:root 0711 EOF +%endif %else rm -f $RPM_BUILD_ROOT/usr/share/aclocal/*.m4 %endif @@ -421,7 +423,9 @@ exit 0 %dir /var/lib/xkb %dir /var/lib/xkb/compiled %ifnarch s390 s390x +%if %suse_version <= 1010 /etc/permissions.d/%name.* +%endif %if %suse_version <= 1010 /usr/X11R6/bin/X /usr/X11R6/bin/Xorg @@ -499,7 +503,9 @@ exit 0 /usr/bin/Xvnc %endif -%changelog -n xorg-x11-server +%changelog +* Mon Feb 19 2007 - sndirsch@suse.de +- use global permissions files for SUSE > 10.1 (Bug #246228) * Thu Feb 01 2007 - sndirsch@suse.de - improved bug-197858_dpms.diff to fix Xserver crash (Bug #197858) * Mon Jan 29 2007 - sndirsch@suse.de