rpms/xfce4-session/FC-5 xfce4-session-4.2.4-rpath.patch, NONE, 1.1 xfce4-session.spec, 1.9, 1.10

[Christoph Wickert (cwickert)]

Author: cwickert

Update of /cvs/extras/rpms/xfce4-session/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6491

Modified Files:
	xfce4-session.spec 
Added Files:
	xfce4-session-4.2.4-rpath.patch 
Log Message:
final update to 4.2.4

xfce4-session-4.2.4-rpath.patch:

--- NEW FILE xfce4-session-4.2.4-rpath.patch ---
--- xfce4-session-4.2.4.orig/configure	2007-06-24 14:41:52.000000000 +0200
+++ xfce4-session-4.2.4/configure	2007-06-24 14:43:08.000000000 +0200
@@ -8806,7 +8806,7 @@
     # are reset later if shared libraries are not supported. Putting them
     # here allows them to be overridden if necessary.
     runpath_var=LD_RUN_PATH
-    hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir'
+    hardcode_libdir_flag_spec='-L$libdir'
     export_dynamic_flag_spec='${wl}--export-dynamic'
     # ancient GNU ld didn't support --whole-archive et. al.
     if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then


Index: xfce4-session.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-session/FC-5/xfce4-session.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- xfce4-session.spec	17 Feb 2006 00:36:30 -0000	1.9
+++ xfce4-session.spec	29 Jun 2007 01:01:23 -0000	1.10
@@ -1,32 +1,38 @@
 Summary: Xfce session manager
 Name: xfce4-session
-Version: 4.2.3
-Release: 3%{?dist}
+Version: 4.2.4
+Release: 1%{?dist}
 License: GPL
 URL: http://www.xfce.org/
-Source0: http://www.us.xfce.org/archive/xfce-4.2.3.1/src/xfce4-session-4.2.3.tar.gz
+Source0: http://www.us.xfce.org/archive/xfce-4.2.4/src/xfce4-session-4.2.4.tar.gz
+
+Patch0: xfce4-session-4.2.4-rpath.patch
+
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: libxfcegui4 >= 4.2.3
-Requires: libxfce4mcs >= 4.2.3
-Requires: xfce-mcs-manager >= 4.2.3
+Requires: libxfcegui4 >= %{version}
+Requires: xfce-mcs-manager >= %{version}
 Requires: xorg-x11-server-utils
-BuildRequires: libxfcegui4-devel >= 4.2.3
-BuildRequires: libxfce4mcs-devel >= 4.2.3
-BuildRequires: xfce-mcs-manager-devel >= 4.2.3
+BuildRequires: libxfcegui4-devel >= %{version}
+BuildRequires: libxfce4mcs-devel >= %{version}
+BuildRequires: xfce-mcs-manager-devel >= %{version}
 BuildRequires: startup-notification-devel
 BuildRequires: gettext
 BuildRequires: imake
 BuildRequires: libXt-devel
 BuildRequires: xorg-x11-server-utils
 
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
+
 %description
 xfce4-session is the session manager for the Xfce desktop environment.
 
 %package devel
 Summary: Development files for xfce4-session
 Group: Development/Libraries
-Requires: xfce4-session >= %{version}
+Requires: %{name} = %{version}-%{release}
+Requires: libxfcegui4-devel >= %{version}
 
 %description devel
 Header files for the Xfce Session Manager.
@@ -41,17 +47,16 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .rpath
 
 %build
-%configure
-
+%configure --disable-static
 make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-rm -f $RPM_BUILD_ROOT/%{_libdir}/xfce4/*/*.a
-rm -f $RPM_BUILD_ROOT/%{_libdir}/xfce4/*/*/*.a
+rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
 rm -f $RPM_BUILD_ROOT/%{_libdir}/xfce4/*/*.la
 rm -f $RPM_BUILD_ROOT/%{_libdir}/xfce4/*/*/*.la
 %find_lang %{name}
@@ -59,25 +64,44 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post
+/sbin/ldconfig
+touch --no-create %{_datadir}/icons/hicolor || :
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+
+%postun
+/sbin/ldconfig
+touch --no-create %{_datadir}/icons/hicolor || :
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+
 %files -f %{name}.lang
 %defattr(-,root,root)
 %doc AUTHORS COPYING ChangeLog ChangeLog.pre-xfce-devel NEWS README TODO
 %{_bindir}/*
 %{_datadir}/applications/*
-%{_datadir}/icons/*
-%{_datadir}/xfce4/*
+%{_datadir}/icons/hicolor/*/apps/*.png
+%{_datadir}/icons/hicolor/scalable/apps/*.svg
+%{_datadir}/xfce4/doc/C/*
+%lang(fr) %{_datadir}/xfce4/doc/fr/*
+%lang(he) %{_datadir}/xfce4/doc/he/*
 %{_libdir}/lib*.so.*
-%{_libdir}/xfce4/mcs-plugins/*
+%{_libdir}/xfce4/mcs-plugins/*.so
+%dir %{_libdir}/xfce4/splash/
+%dir %{_libdir}/xfce4/splash/engines/
 %{_libdir}/xfce4/splash/engines/libmice.*
 %{_libexecdir}/xfsm-shutdown-helper
 %{_mandir}/man1/*
-%{_sysconfdir}/xdg/xfce4-session/*
+%config %{_sysconfdir}/xdg/xfce4-session/*
+
+
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
 
 %files devel
 %defattr(-,root,root)
 %{_includedir}/xfce4/xfce4-session-4.2/libxfsm/*.h
 %{_libdir}/lib*.so
-%{_libdir}/*a
 %{_libdir}/pkgconfig/*.pc
 
 %files engines
@@ -88,6 +112,11 @@
 %{_libexecdir}/balou-*
 
 %changelog
+* Wed Jun 20 2007 Christoph Wickert <fedora at christoph-wickert.de> - 4.2.4-1
+- Update to 4.2.4
+- Disaple rpaths
+- disable-static instead of removing .a files
+
 * Thu Feb 16 2006 Kevin Fenzi <kevin at tummy.com> - 4.2.3-3.fc5
 - Rebuild for fc5
 
@@ -119,8 +148,8 @@
 - Updated to 4.2.1 version
 
 * Tue Mar  8 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.0-2
-- Fixed to use %find_lang
-- Removed generic INSTALL from %doc
+- Fixed to use %%find_lang
+- Removed generic INSTALL from %%doc
 
 * Sun Mar  6 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.0-1
 - Inital Fedora Extras version