1
0

moved rpm macro file from to /usr/lib/rpm to /usr/lib/rpm/macros.d

OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorg-x11-server?expand=0&rev=769
This commit is contained in:
Stefan Dirsch 2020-06-30 20:43:25 +00:00 committed by Git OBS Bridge
parent 114883c8c3
commit d92c999853
2 changed files with 4 additions and 4 deletions

View File

@ -2,8 +2,8 @@
Tue Jun 30 16:48:06 UTC 2020 - Stefan Dirsch <sndirsch@suse.com> Tue Jun 30 16:48:06 UTC 2020 - Stefan Dirsch <sndirsch@suse.com>
- move xorg_pci_ids dir from /etc/X11 to /usr/share/X11 and - move xorg_pci_ids dir from /etc/X11 to /usr/share/X11 and
xorg-x11-server.macros from /etc/rpm to /usr/lib/rpm; no longer xorg-x11-server.macros from /etc/rpm to /usr/lib/rpm/macros.d;
package /etc/X11/xorg.conf.d (boo#1173056) no longer package /etc/X11/xorg.conf.d (boo#1173056)
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Jun 4 10:02:58 UTC 2020 - Stefan Dirsch <sndirsch@suse.com> Thu Jun 4 10:02:58 UTC 2020 - Stefan Dirsch <sndirsch@suse.com>

View File

@ -512,7 +512,7 @@ install -m 644 %_sourcedir/sysconfig.displaymanager.template \
install -m 755 $RPM_SOURCE_DIR/xorg-backtrace %{buildroot}%{_bindir}/xorg-backtrace install -m 755 $RPM_SOURCE_DIR/xorg-backtrace %{buildroot}%{_bindir}/xorg-backtrace
cp %{S:90} . cp %{S:90} .
./config.status --file xorg-x11-server.macros ./config.status --file xorg-x11-server.macros
install -D xorg-x11-server.macros %{buildroot}/usr/lib/rpm/macros.xorg-server install -D xorg-x11-server.macros %{buildroot}/usr/lib/rpm/macros.d/macros.xorg-server
%ifnarch s390 s390x %ifnarch s390 s390x
%if 0%{?suse_version} >= 1315 %if 0%{?suse_version} >= 1315
mkdir -p %{buildroot}%{_libdir}/xorg/modules/extensions/xorg mkdir -p %{buildroot}%{_libdir}/xorg/modules/extensions/xorg
@ -663,7 +663,7 @@ fi
%{_libdir}/pkgconfig/*.pc %{_libdir}/pkgconfig/*.pc
%{_datadir}/aclocal/*.m4 %{_datadir}/aclocal/*.m4
%endif %endif
/usr/lib/rpm/macros.xorg-server /usr/lib/rpm/macros.d/macros.xorg-server
%files source %files source
%defattr(-,root,root) %defattr(-,root,root)