1
0
OBS User unknown 2009-02-16 11:26:36 +00:00 committed by Git OBS Bridge
parent 86e134a997
commit b85f640cc1
2 changed files with 15 additions and 6 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Feb 16 09:03:31 CET 2009 - sndirsch@suse.de
- /var/X11R6/bin no longer covered by FHS; switched to
/var/lib/X11 (bnc #470969)
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Jan 31 15:21:21 CET 2009 - schwab@suse.de Sat Jan 31 15:21:21 CET 2009 - schwab@suse.de

View File

@ -29,7 +29,7 @@ BuildRequires: libjpeg-devel
Url: http://xorg.freedesktop.org/ Url: http://xorg.freedesktop.org/
%define EXPERIMENTAL 0 %define EXPERIMENTAL 0
Version: 7.4 Version: 7.4
Release: 24 Release: 25
License: X11/MIT License: X11/MIT
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/X11/Servers/XF86_4 Group: System/X11/Servers/XF86_4
@ -321,9 +321,9 @@ ln -snf ../../bin/X $RPM_BUILD_ROOT/usr/X11R6/bin/X
ln -snf ../../bin/Xorg $RPM_BUILD_ROOT/usr/X11R6/bin/Xorg ln -snf ../../bin/Xorg $RPM_BUILD_ROOT/usr/X11R6/bin/Xorg
%endif %endif
chmod u+s $RPM_BUILD_ROOT/usr/bin/Xorg chmod u+s $RPM_BUILD_ROOT/usr/bin/Xorg
mkdir -p $RPM_BUILD_ROOT/var/X11R6/bin mkdir -p $RPM_BUILD_ROOT/var/lib/X11
ln -snf ../../../usr/bin/Xorg $RPM_BUILD_ROOT/var/X11R6/bin/X ln -snf ../../../usr/bin/Xorg $RPM_BUILD_ROOT/var/lib/X11/X
ln -snf ../../var/X11R6/bin/X $RPM_BUILD_ROOT/usr/bin/X ln -snf ../../var/lib/X11/X $RPM_BUILD_ROOT/usr/bin/X
mkdir -p $RPM_BUILD_ROOT/usr/%{_lib}/xorg/modules/updates/{fonts,input,linux,drivers,multimedia,extensions} 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 install -m 644 $RPM_SOURCE_DIR/README.updates $RPM_BUILD_ROOT/usr/%{_lib}/xorg/modules/updates
%if %suse_version <= 1010 %if %suse_version <= 1010
@ -475,7 +475,7 @@ exit 0
%endif %endif
%dir /usr/%{_lib}/xorg %dir /usr/%{_lib}/xorg
%ifnarch s390 s390x %ifnarch s390 s390x
%dir /var/X11R6/bin %dir /var/lib/X11
%endif %endif
%dir /var/lib/xkb %dir /var/lib/xkb
%dir /var/lib/xkb/compiled %dir /var/lib/xkb/compiled
@ -532,7 +532,7 @@ exit 0
%endif %endif
%{_mandir}/man7/* %{_mandir}/man7/*
%ifnarch s390 s390x %ifnarch s390 s390x
/var/X11R6/bin/X /var/lib/X11/X
%endif %endif
/var/lib/xkb/compiled/README.compiled /var/lib/xkb/compiled/README.compiled
%ifnarch s390 s390x %ifnarch s390 s390x
@ -566,6 +566,9 @@ exit 0
%endif %endif
%changelog %changelog
* Mon Feb 16 2009 sndirsch@suse.de
- /var/X11R6/bin no longer covered by FHS; switched to
/var/lib/X11 (bnc #470969)
* Sat Jan 31 2009 schwab@suse.de * Sat Jan 31 2009 schwab@suse.de
- Provide proper fallback when legacy_mem is not available. - Provide proper fallback when legacy_mem is not available.
* Thu Jan 29 2009 sndirsch@suse.de * Thu Jan 29 2009 sndirsch@suse.de