Attachment 291409 Details for Bug 226650 – spec file patch with cleanups

[patch] spec file patch with cleanups

xdm.spec.diff (text/plain), 3.89 KB, created by Patrice Dumas on 2008-01-11 18:39:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Patrice Dumas

Created: 2008-01-11 18:39:19 UTC

Size: 3.89 KB

patch

obsolete

>? .build-1.1.6-2.fc9.log
>? .xorg-x11-xdm.spec.swp
>? i386
>? xdm-1.1.6
>? xdm-1.1.6-ck.patch
>? xorg-x11-xdm-1.1.6-2.fc9.src.rpm
>? xorg-x11-xdm.spec-pat
>? xorg-x11-xdm.spec-pat.2
>Index: xorg-x11-xdm.spec
>===================================================================
>RCS file: /cvs/pkgs/rpms/xorg-x11-xdm/devel/xorg-x11-xdm.spec,v
>retrieving revision 1.36
>diff -u -3 -p -r1.36 xorg-x11-xdm.spec
>--- xorg-x11-xdm.spec	24 Aug 2007 14:03:31 -0000	1.36
>+++ xorg-x11-xdm.spec	11 Jan 2008 18:36:05 -0000
>@@ -6,7 +6,8 @@ Version: 1.1.6
> Release: 2%{?dist}
> # NOTE: Remove Epoch line if/when the package ever gets renamed.
> Epoch: 1
>-License: MIT/X11
>+# all files are MIT/X11, except for prngc.c which is BSD
>+License: MIT and BSD
> Group: User Interface/X
> URL: http://www.x.org
> BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
>@@ -22,9 +23,6 @@ Source13: xserver.pamd
> Patch10: xdm-1.0.1-redhat-xdm-config-fix.patch
> Patch11: xdm-1.0.5-sessreg-utmp-fix-bug177890.patch
> 
>-# FIXME: Temporary build dependencies for autotool dependence.
>-BuildRequires: autoconf, automake, libtool
>-
> BuildRequires: pkgconfig
> BuildRequires: xorg-x11-util-macros
> BuildRequires: xorg-x11-xtrans-devel
>@@ -48,10 +46,11 @@ BuildRequires: libXau-devel
> BuildRequires: libXinerama-devel
> BuildRequires: pam-devel
> 
>-Provides: xdm
>+Provides: xdm = %{version}-%{release}
> 
>-Obsoletes: XFree86-xdm
>-Obsoletes: xinitrc
>+Obsoletes: XFree86-xdm < 4.3.1
>+Provides: XFree86-xdm = 4.3.1
>+Obsoletes: xinitrc < 4.0.18.2
> 
> # NOTE: xorg-x11-filesystem is required by all packages that put files into
> # /usr/lib/X11 or /usr/include/X11 to ensure that on OS upgrades, they are
>@@ -77,11 +76,9 @@ X.Org X11 xdm - X Display Manager
> %patch11 -p0 -b .redhat-sessreg-utmp-fix-bug177890
> 
> %build
>-# FIXME: Work around pointer aliasing warnings from compiler for now
> export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
> # NOTE: We invoke aclocal/automake/autoconf to enable the changes present in
> # xdm-0.99.3-xdm-app-defaults-in-datadir.patch & xdm-0.99.3-xdm-configdir.patch
>-aclocal ; libtoolize --force ; automake ; autoconf
> %configure \
> 	--disable-static \
> 	--disable-xprint \
>@@ -93,30 +90,28 @@ make %{?_smp_mflags}
> 
> %install
> rm -rf $RPM_BUILD_ROOT
>-make install DESTDIR=$RPM_BUILD_ROOT
>+make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
> 
> # FIXME: Remove all libtool archives (*.la) from modules directory.  This
> # should be fixed in upstream Makefile.am or whatever.
>-find $RPM_BUILD_ROOT -name '*.la' | xargs rm -f --
>+rm $RPM_BUILD_ROOT%{_libdir}/X11/xdm/libXdmGreet.la
> 
>-install -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xdm/Xsetup_0
>+install -p -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xdm/Xsetup_0
> 
> # Install pam xdm config files
>-{
>-   mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/pam.d
>-   install -c -m 644 %{SOURCE13} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/xserver
>-   install -c -m 644 %{SOURCE11} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/xdm
>-}
>+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/pam.d
>+install -c -p -m 644 %{SOURCE13} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/xserver
>+install -c -p -m 644 %{SOURCE11} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/xdm
> 
>-rm -f $RPM_BUILD_ROOT%{_sysconfdir}/X11/xdm/Xsession
>-(cd $RPM_BUILD_ROOT%{_sysconfdir}/X11/xdm; ln -sf ../xinit/Xsession .)
>+rm $RPM_BUILD_ROOT%{_sysconfdir}/X11/xdm/Xsession
>+ln -s ../xinit/Xsession $RPM_BUILD_ROOT%{_sysconfdir}/X11/xdm/Xsession
> 
> %clean
> rm -rf $RPM_BUILD_ROOT
> 
> %files
> %defattr(-,root,root,-)
>-%doc AUTHORS COPYING INSTALL NEWS README ChangeLog
>+%doc AUTHORS COPYING NEWS README ChangeLog
> %{_bindir}/xdm
> %{_bindir}/xdmshell
> %dir %{_sysconfdir}/X11/xdm
>@@ -145,7 +140,7 @@ rm -rf $RPM_BUILD_ROOT
> %dir %{_datadir}/X11
> # NOTE: We intentionally default to OS supplied file being favoured here on
> # OS upgrades.
>-%config %{_datadir}/X11/app-defaults/Chooser
>+%{_datadir}/X11/app-defaults/Chooser
> %dir %{_datadir}/xdm
> %dir %{_datadir}/xdm/pixmaps
> %{_datadir}/xdm/pixmaps/xorg-bw.xpm

Actions: View | Diff

Attachments on bug 226650: 291409