packages: fvwm2/fvwm2.spec, fvwm2/fvwm2-xft2-link.patch (NEW) - rel 3 - fix...

[baggins]

Author: baggins                      Date: Wed Jul 27 23:54:40 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 3
- fix linking (xft2 must be missing link-time deps)

---- Files affected:
packages/fvwm2:
   fvwm2.spec (1.91 -> 1.92) , fvwm2-xft2-link.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/fvwm2/fvwm2.spec
diff -u packages/fvwm2/fvwm2.spec:1.91 packages/fvwm2/fvwm2.spec:1.92
--- packages/fvwm2/fvwm2.spec:1.91	Wed Jul 27 22:29:10 2011
+++ packages/fvwm2/fvwm2.spec	Thu Jul 28 01:54:35 2011
@@ -21,7 +21,7 @@
 Summary(tr.UTF-8):	Yaygın bir pencere denetleyicisi
 Name:		fvwm2
 Version:	2.5.28
-Release:	2
+Release:	3
 License:	GPL
 Group:		X11/Window Managers
 Source0:	ftp://ftp.fvwm.org/pub/fvwm/version-2/fvwm-%{version}.tar.bz2
@@ -39,6 +39,7 @@
 Patch2:		%{name}-locale_names.patch
 Patch3:		%{name}-varia.patch
 Patch4:		%{name}-libpng14.patch
+Patch5:		%{name}-xft2-link.patch
 URL:		http://www.fvwm.org/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -140,6 +141,7 @@
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 mv -f po/FvwmScript.sv{_SE,}.po
 mv -f po/FvwmTaskBar.sv{_SE,}.po
@@ -193,7 +195,7 @@
 # Conflicts with wmmaker
 mv $RPM_BUILD_ROOT%{_pixmapsdir}/xv{,-fvwm}.xpm
 
-install %{SOURCE3} $RPM_BUILD_ROOT%{_bindir}/%{name}-session
+install %{SOURCE3} $RPM_BUILD_ROOT%{_bindir}/fvwm2-session
 install %{SOURCE4} $RPM_BUILD_ROOT%{_datadir}/xsessions/%{name}.desktop
 %{?with_gnome:install %{SOURCE5} $RPM_BUILD_ROOT%{_wmpropsdir}}
 install %{SOURCE6} $RPM_BUILD_ROOT%{_pixmapsdir}
@@ -223,9 +225,9 @@
 %ghost %{_sysconfdir}/fvwm2.menu2
 %attr(755,root,root) %{_bindir}/[!f]*
 %attr(755,root,root) %{_bindir}/fvwm
-%attr(755,root,root) %{_bindir}/fvwm2
 %attr(755,root,root) %{_bindir}/fvwm-[!p]*
-%attr(755,root,root) %{_bindir}/fvwm-session
+%attr(755,root,root) %{_bindir}/fvwm2
+%attr(755,root,root) %{_bindir}/fvwm2-session
 %dir %{_libdir}/fvwm
 %attr(755,root,root) %{_libdir}/fvwm/Fvwm[!DGPWT]*
 %attr(755,root,root) %{_libdir}/fvwm/FvwmD[!e]*
@@ -275,6 +277,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.92  2011/07/27 23:54:35  baggins
+- rel 3
+- fix linking (xft2 must be missing link-time deps)
+
 Revision 1.91  2011/07/27 20:29:10  baggins
 - rel 2
 - package wm-properties only if built with gnome (2) support

================================================================
Index: packages/fvwm2/fvwm2-xft2-link.patch
diff -u /dev/null packages/fvwm2/fvwm2-xft2-link.patch:1.1
--- /dev/null	Thu Jul 28 01:54:40 2011
+++ packages/fvwm2/fvwm2-xft2-link.patch	Thu Jul 28 01:54:35 2011
@@ -0,0 +1,11 @@
+--- fvwm-2.5.28/configure.ac~	2011-07-28 01:41:11.691879311 +0200
++++ fvwm-2.5.28/configure.ac	2011-07-28 01:49:18.593313721 +0200
+@@ -715,7 +715,7 @@
+       AC_DEFINE(HAVE_XFT2)
+       AC_DEFINE(HAVE_XFT)
+       AC_DEFINE(HAVE_XFT_UTF8)
+-      Xft_LIBS=$XFT_LIBS
++      Xft_LIBS="$XFT_LIBS -lfontconfig"
+       Xft_CFLAGS=$XFT_CFLAGS
+     else
+       problem_xft=": Can't detect Xft2, detected fontconfig"
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/fvwm2/fvwm2.spec?r1=1.91&r2=1.92&f=u