rpms/font-manager/devel font-manager-0.5.4-fix-libdir.patch, NONE, 1.1 font-manager.spec, 1.4, 1.5

[Jean-Francois Saucier]

Author: jfsaucier

Update of /cvs/pkgs/rpms/font-manager/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv5535

Modified Files:
	font-manager.spec 
Added Files:
	font-manager-0.5.4-fix-libdir.patch 
Log Message:
Update to 0.5.4-2

font-manager-0.5.4-fix-libdir.patch:
 Makefile.am |    6 +++---
 Makefile.in |    6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

--- NEW FILE font-manager-0.5.4-fix-libdir.patch ---
diff -up font-manager-0.5.4/src/Makefile.am.orig font-manager-0.5.4/src/Makefile.am
--- font-manager-0.5.4/src/Makefile.am.orig	2010-06-03 11:11:52.586186566 -0400
+++ font-manager-0.5.4/src/Makefile.am	2010-06-03 11:12:47.663191065 -0400
@@ -25,7 +25,7 @@ all: constants.py fontutils
 
 make-install-dirs:
 	@mkdir -p $(DESTDIR)$(prefix)/bin
-	@mkdir -p $(DESTDIR)$(prefix)/lib/font-manager
+	@mkdir -p $(DESTDIR)$(libdir)/font-manager
 	@mkdir -p $(DESTDIR)$(prefix)/share/applications
 	@mkdir -p $(DESTDIR)$(prefix)/share/font-manager
 	@mkdir -p $(DESTDIR)$(prefix)/share/font-manager/core
@@ -36,7 +36,7 @@ make-install-dirs:
 install: all make-install-dirs
 	install -m 755 font-manager $(DESTDIR)$(prefix)/bin/
 	install -m 755 font-sampler $(DESTDIR)$(prefix)/bin/
-	install -m 644 *.so $(DESTDIR)$(prefix)/lib/font-manager/
+	install -m 644 *.so $(DESTDIR)$(libdir)/font-manager/
 	install -m 644 *.py{,c,o} $(DESTDIR)$(prefix)/share/font-manager/
 	install -m 644 core/*.py{,c,o} $(DESTDIR)$(prefix)/share/font-manager/core/
 	install -m 644 data/* $(DESTDIR)$(prefix)/share/font-manager/data/
@@ -46,7 +46,7 @@ install: all make-install-dirs
 
 uninstall:
 	@rm -fv $(DESTDIR)$(prefix)/bin/font-manager
-	@rm -rfv $(DESTDIR)$(prefix)/lib/font-manager
+	@rm -rfv $(DESTDIR)$(libdir)/font-manager
 	@rm -rfv $(DESTDIR)$(prefix)/share/font-manager
 	@rm -fv $(DESTDIR)$(prefix)/share/applications/font-manager.desktop
 
diff -up font-manager-0.5.4/src/Makefile.in.orig font-manager-0.5.4/src/Makefile.in
--- font-manager-0.5.4/src/Makefile.in.orig	2010-06-03 11:11:57.617200590 -0400
+++ font-manager-0.5.4/src/Makefile.in	2010-06-03 11:13:10.370953954 -0400
@@ -339,7 +339,7 @@ all: constants.py fontutils
 
 make-install-dirs:
 	@mkdir -p $(DESTDIR)$(prefix)/bin
-	@mkdir -p $(DESTDIR)$(prefix)/lib/font-manager
+	@mkdir -p $(DESTDIR)$(libdir)/font-manager
 	@mkdir -p $(DESTDIR)$(prefix)/share/applications
 	@mkdir -p $(DESTDIR)$(prefix)/share/font-manager
 	@mkdir -p $(DESTDIR)$(prefix)/share/font-manager/core
@@ -350,7 +350,7 @@ make-install-dirs:
 install: all make-install-dirs
 	install -m 755 font-manager $(DESTDIR)$(prefix)/bin/
 	install -m 755 font-sampler $(DESTDIR)$(prefix)/bin/
-	install -m 644 *.so $(DESTDIR)$(prefix)/lib/font-manager/
+	install -m 644 *.so $(DESTDIR)$(libdir)/font-manager/
 	install -m 644 *.py{,c,o} $(DESTDIR)$(prefix)/share/font-manager/
 	install -m 644 core/*.py{,c,o} $(DESTDIR)$(prefix)/share/font-manager/core/
 	install -m 644 data/* $(DESTDIR)$(prefix)/share/font-manager/data/
@@ -360,7 +360,7 @@ install: all make-install-dirs
 
 uninstall:
 	@rm -fv $(DESTDIR)$(prefix)/bin/font-manager
-	@rm -rfv $(DESTDIR)$(prefix)/lib/font-manager
+	@rm -rfv $(DESTDIR)$(libdir)/font-manager
 	@rm -rfv $(DESTDIR)$(prefix)/share/font-manager
 	@rm -fv $(DESTDIR)$(prefix)/share/applications/font-manager.desktop
 


Index: font-manager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/font-manager/devel/font-manager.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- font-manager.spec	3 Jun 2010 01:09:42 -0000	1.4
+++ font-manager.spec	3 Jun 2010 16:20:06 -0000	1.5
@@ -4,18 +4,22 @@
 
 Name:           font-manager
 Version:        0.5.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A font management application for the GNOME desktop environment
 Group:          Applications/Publishing
 License:        GPLv3+
 URL:            http://code.google.com/p/font-manager
 Source0:        http://font-manager.googlecode.com/files/%{name}-%{version}.tar.bz2
+
+# Patch to fix the libdir on x86_64
+Patch0:         font-manager-0.5.4-fix-libdir.patch
+
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 # Explicit dependencies required because there is no automatic dependencies
 # resolution for the python modules.
-Requires:       fontconfig libxml2-python pygtk2 freetype fontconfig
-BuildRequires:  python desktop-file-utils fontconfig-devel
+Requires:       fontconfig libxml2-python pygtk2 freetype
+BuildRequires:  python desktop-file-utils fontconfig-devel glib2-devel python-devel
 
 %description
 Font Manager is an application that allows users to easily manage fonts
@@ -27,6 +31,7 @@ Enlightenment, and even KDE.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure
@@ -50,6 +55,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/applications/font-manager.desktop
 
 %changelog
+* Thu Jun  3 2010 Jean-Francois Saucier <jfsaucier at infoglobe.ca> - 0.5.4-2
+- Fix the compilation error on x86_64
+- Fix some BuildRequires for the new version
+
 * Wed Jun  2 2010 Jean-Francois Saucier <jfsaucier at infoglobe.ca> - 0.5.4-1
 - Update to new upstream version