From 5ee49e353e27e4ef3a3e20c1bddc1abfcd7b7025 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristian=20H=C3=B8gsberg?= Date: Tue, 20 Jun 2006 02:21:01 +0000 Subject: [PATCH] =?UTF-8?q?*=20Mon=20Jun=2019=202006=20Kristian=20H=C3=B8g?= =?UTF-8?q?sberg=20=20-=201.1.0-19=20-=20Add=20with=5Fxnes?= =?UTF-8?q?t=5Fserver=20conditional=20and=20disable=20on=20s390,=20since?= =?UTF-8?q?=20Xnest=20=20=20fails=20to=20build=20on=20there=20(Xlib=20does?= =?UTF-8?q?n't=20get=20added=20to=20the=20link=20line).=20-=20Add=20-f=20t?= =?UTF-8?q?o=20removal=20of=20xorgconfig=20and=20others=20which=20may=20or?= =?UTF-8?q?=20may=20not=20be=20built.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- xorg-x11-server.spec | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index 1bb3e90..b992ec9 100644 --- a/xorg-x11-server.spec +++ b/xorg-x11-server.spec @@ -378,12 +378,12 @@ mkdir -p $RPM_BUILD_ROOT%{_libdir}/xorg/modules/{drivers,input} # FIXME: Remove unwanted files/dirs { - rm $RPM_BUILD_ROOT%{_bindir}/xorgconfig - rm $RPM_BUILD_ROOT%{_mandir}/man1/xorgconfig.1* - rm $RPM_BUILD_ROOT%{_libdir}/X11/Cards - rm $RPM_BUILD_ROOT%{_libdir}/X11/Options - rm $RPM_BUILD_ROOT%{_libdir}/X11/getconfig/cfg.sample - rm $RPM_BUILD_ROOT%{_libdir}/X11/getconfig/xorg.cfg + rm -f $RPM_BUILD_ROOT%{_bindir}/xorgconfig + rm -f $RPM_BUILD_ROOT%{_mandir}/man1/xorgconfig.1* + rm -f $RPM_BUILD_ROOT%{_libdir}/X11/Cards + rm -f $RPM_BUILD_ROOT%{_libdir}/X11/Options + rm -f $RPM_BUILD_ROOT%{_libdir}/X11/getconfig/cfg.sample + rm -f $RPM_BUILD_ROOT%{_libdir}/X11/getconfig/xorg.cfg %if ! %{with_developer_utils} rm -f $RPM_BUILD_ROOT%{_bindir}/inb rm -f $RPM_BUILD_ROOT%{_bindir}/inl @@ -617,6 +617,7 @@ rm -rf $RPM_BUILD_ROOT * Mon Jun 19 2006 Kristian Høgsberg - 1.1.0-19 - Add with_xnest_server conditional and disable on s390, since Xnest fails to build on there (Xlib doesn't get added to the link line). +- Add -f to removal of xorgconfig and others which may or may not be built. * Mon Jun 19 2006 Kristian Høgsberg - 1.1.0-18 - Add xorg-x11-server-1.1.0-convolution-filter-fix.patch and