rpms/xffm/FC-5 xffm-4.2.4-rpath.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 xffm.spec, 1.13, 1.14

[Christoph Wickert (cwickert)]

Author: cwickert

Update of /cvs/extras/rpms/xffm/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv504

Modified Files:
	.cvsignore sources xffm.spec 
Added Files:
	xffm-4.2.4-rpath.patch 
Log Message:
final update to 4.2.4

xffm-4.2.4-rpath.patch:

--- NEW FILE xffm-4.2.4-rpath.patch ---
--- xffm-4.2.4.orig/configure	2007-06-24 13:58:36.000000000 +0200
+++ xffm-4.2.4/configure	2007-06-24 14:02:52.000000000 +0200
@@ -9593,7 +9593,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
@@ -30009,7 +30009,7 @@
 
     { echo "$as_me:$LINENO: checking DBH_LIBS" >&5
 echo $ECHO_N "checking DBH_LIBS... $ECHO_C" >&6; }
-    DBH_LIBS=`$PKG_CONFIG --libs "dbh-1.0"`
+    DBH_LIBS=`$PKG_CONFIG --libs-only-l "dbh-1.0"`
     { echo "$as_me:$LINENO: result: $DBH_LIBS" >&5
 echo "${ECHO_T}$DBH_LIBS" >&6; }
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xffm/FC-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	12 Nov 2005 18:21:37 -0000	1.4
+++ .cvsignore	28 Jun 2007 21:39:56 -0000	1.5
@@ -1 +1 @@
-xffm-4.2.3.tar.gz
+xffm-4.2.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xffm/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	12 Nov 2005 18:21:37 -0000	1.4
+++ sources	28 Jun 2007 21:39:56 -0000	1.5
@@ -1 +1 @@
-5d2a990bb725b6720db93f34dd91a731  xffm-4.2.3.tar.gz
+8b2097c239104e60542c42243aa8b319  xffm-4.2.4.tar.gz


Index: xffm.spec
===================================================================
RCS file: /cvs/extras/rpms/xffm/FC-5/xffm.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- xffm.spec	9 Jun 2006 01:11:31 -0000	1.13
+++ xffm.spec	28 Jun 2007 21:39:56 -0000	1.14
@@ -1,21 +1,20 @@
 Summary: Next generation filemanager and SMB network navigator for Xfce4
 Name: xffm
-Version: 4.2.3
-Release: 4%{?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/xffm-4.2.3.tar.gz
+Source0: http://www.us.xfce.org/archive/xfce-4.2.4/src/xffm-4.2.4.tar.gz
 
-Patch0: xffm-4.2.2-rpath.patch
+Patch0: xffm-4.2.4-rpath.patch
 Patch1: xffm-4.2.3-menu.patch
 
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Requires: libxfce4mcs >= %{version}
+Requires: xfce-mcs-manager >= %{version}
 Requires: libxfce4util >= %{version}
 Requires: libxfcegui4 >= %{version}
-Requires: libxml2 >= 2.4.0
 
 BuildRequires: dbh-devel
 BuildRequires: gtk2-devel
@@ -28,10 +27,25 @@
 BuildRequires: imake
 BuildRequires: libXt-devel
 BuildRequires: gettext
+BuildRequires: chrpath
+
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
 
 %description
 This package includes a filemanager and SMB network navigator for Xfce4.
 
+%package devel
+Summary: Development tools for xffm filemanager
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+Requires: libxfcegui4-devel >= %{version}
+Requires: libxml2-devel >= 2.4.0
+
+%description devel
+This package includes the static libraries and files you will need to compile 
+applications based on xffm.
+
 %prep
 %setup -q
 %patch0 -p1 -b .rpath
@@ -55,20 +69,45 @@
 %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 README TODO ChangeLog NEWS COPYING AUTHORS
 %{_bindir}/*
-%{_libdir}/lib*
-%{_libdir}/pkgconfig/*
-%{_libdir}/xfce4
-%{_datadir}/xffm
-%{_datadir}/xfce4/*
+%{_libdir}/lib*.so.*
+%{_libdir}/xfce4/mcs-plugins/*.so
+%{_libdir}/xfce4/xffm/
+%{_datadir}/xffm/
+%{_datadir}/xfce4/xffm/
+%{_datadir}/xfce4/doc/C/*
+%lang(fr) %{_datadir}/xfce4/doc/fr/*
+%lang(he) %{_datadir}/xfce4/doc/he/*
 %{_datadir}/applications/*
 %{_datadir}/icons/hicolor/*/*/*
 %{_mandir}/man?/*
 
+%files devel
+%defattr(-,root,root)
+%{_libdir}/lib*.so
+%{_libdir}/pkgconfig/*.pc
+
 %changelog
+* Wed Jun 20 2007 Christoph Wickert <fedora at christoph-wickert.de> - 4.2.4-1
+- Update to 4.2.4
+- Update rpath patch
+- Split out devel package
+- Require xfce-mcs-manager
+- Run ldconfig and gtk-update-icon-cache in %%post and %%postun
+
 * Wed Jun  7 2006 Kevin Fenzi <kevin at tummy.com> - 4.2.3-4
 - Add gettext to BuildRequires (fixes #194145)
 
@@ -115,7 +154,7 @@
 - update to 4.0.6
 
 * Thu Jun 17 2004 Than Ngo <than at redhat.com> 4.0.5-4
-- own %{_datadir}/xffm, bug #124825
+- own %%{_datadir}/xffm, bug #124825
 - use %%find_lang macros, bug #124954
 - add buildrequires on xfce-mcs-manager-devel, bug #125061