rpms/font-manager/F-13 font-manager-0.5.4-fix-libdir.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 font-manager.spec, 1.2, 1.3 sources, 1.3, 1.4 font-manager-0.4.3-adjust-python-optimization.patch, 1.1, NONE
Jean-Francois Saucier
jfsaucier at fedoraproject.org
Thu Jun 3 23:35:38 UTC 2010
Author: jfsaucier
Update of /cvs/pkgs/rpms/font-manager/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv17541
Modified Files:
.cvsignore font-manager.spec sources
Added Files:
font-manager-0.5.4-fix-libdir.patch
Removed Files:
font-manager-0.4.3-adjust-python-optimization.patch
Log Message:
Update to 0.5.4-3
font-manager-0.5.4-fix-libdir.patch:
Makefile.am | 20 +++++++++++++++++---
Makefile.in | 20 +++++++++++++++++---
font-manager.in | 4 ++--
font-sampler.in | 4 ++--
4 files changed, 38 insertions(+), 10 deletions(-)
--- NEW FILE font-manager-0.5.4-fix-libdir.patch ---
diff -up font-manager-0.5.4/src/font-manager.in.orig font-manager-0.5.4/src/font-manager.in
--- font-manager-0.5.4/src/font-manager.in.orig 2010-06-03 18:47:29.454168149 -0400
+++ font-manager-0.5.4/src/font-manager.in 2010-06-03 18:47:48.826171758 -0400
@@ -38,8 +38,8 @@ if os.path.exists(desktop_file):
PACKAGE_DIR = os.path.dirname(os.path.abspath(__file__))
LIB_DIR = os.path.dirname(os.path.abspath(__file__))
else:
- PACKAGE_DIR = os.path.join('@prefix@', 'share/font-manager')
- LIB_DIR = os.path.join('@prefix@', 'lib/font-manager')
+ PACKAGE_DIR = os.path.join('@PREFIX@', 'share/font-manager')
+ LIB_DIR = os.path.join('@LIBDIR@', 'font-manager')
for directory in PACKAGE_DIR, LIB_DIR:
if not directory in sys.path:
diff -up font-manager-0.5.4/src/font-sampler.in.orig font-manager-0.5.4/src/font-sampler.in
--- font-manager-0.5.4/src/font-sampler.in.orig 2010-06-03 18:47:33.270210543 -0400
+++ font-manager-0.5.4/src/font-sampler.in 2010-06-03 18:47:48.827169231 -0400
@@ -45,8 +45,8 @@ if exists(desktop_file):
PACKAGE_DIR = dirname(abspath(__file__))
LIB_DIR = dirname(abspath(__file__))
else:
- PACKAGE_DIR = join('@prefix@', 'share/font-manager')
- LIB_DIR = join('@prefix@', 'lib/font-manager')
+ PACKAGE_DIR = join('@PREFIX@', 'share/font-manager')
+ LIB_DIR = join('@LIBDIR@', 'font-manager')
for directory in PACKAGE_DIR, LIB_DIR:
if not directory in sys.path:
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 18:47:38.269209092 -0400
+++ font-manager-0.5.4/src/Makefile.am 2010-06-03 18:50:33.388921736 -0400
@@ -19,13 +19,27 @@ constants.py: constants.py.in
< $< \
> $@
+font-manager: font-manager.in
+ @sed \
+ -e 's|@PREFIX[@]|$(prefix)|g' \
+ -e 's|@LIBDIR[@]|$(libdir)|g' \
+ < $< \
+ > $@
+
+font-sampler: font-sampler.in
+ @sed \
+ -e 's|@PREFIX[@]|$(prefix)|g' \
+ -e 's|@LIBDIR[@]|$(libdir)|g' \
+ < $< \
+ > $@
+
all: constants.py fontutils
@python -m compileall .
@python -O -m compileall .
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 +50,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 +60,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 18:47:41.253208875 -0400
+++ font-manager-0.5.4/src/Makefile.in 2010-06-03 18:49:55.541919154 -0400
@@ -333,13 +333,27 @@ constants.py: constants.py.in
< $< \
> $@
+font-manager: font-manager.in
+ @sed \
+ -e 's|@PREFIX[@]|$(prefix)|g' \
+ -e 's|@LIBDIR[@]|$(libdir)|g' \
+ < $< \
+ > $@
+
+font-sampler: font-sampler.in
+ @sed \
+ -e 's|@PREFIX[@]|$(prefix)|g' \
+ -e 's|@LIBDIR[@]|$(libdir)|g' \
+ < $< \
+ > $@
+
all: constants.py fontutils
@python -m compileall .
@python -O -m compileall .
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 +364,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 +374,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: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/font-manager/F-13/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore 16 Apr 2010 12:43:37 -0000 1.3
+++ .cvsignore 3 Jun 2010 23:35:37 -0000 1.4
@@ -1 +1 @@
-font-manager-0.4.4.tar.bz2
+font-manager-0.5.4.tar.bz2
Index: font-manager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/font-manager/F-13/font-manager.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- font-manager.spec 16 Apr 2010 12:43:37 -0000 1.2
+++ font-manager.spec 3 Jun 2010 23:35:37 -0000 1.3
@@ -1,16 +1,25 @@
+# Disable the generation of useless debuginfo for the context of this
+# generally noarch package (at least to me)
+%global debug_package %{nil}
+
Name: font-manager
-Version: 0.4.4
-Release: 1%{?dist}
+Version: 0.5.4
+Release: 3%{?dist}
Summary: A font management application for the GNOME desktop environment
-BuildArch: noarch
Group: Applications/Publishing
License: GPLv3+
URL: http://code.google.com/p/font-manager
Source0: http://font-manager.googlecode.com/files/%{name}-%{version}.tar.bz2
-Patch0: font-manager-0.4.3-adjust-python-optimization.patch
+
+# 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)
-Requires: fontconfig libxml2-python pygtk2
-BuildRequires: python desktop-file-utils
+
+# Explicit dependencies required because there is no automatic dependencies
+# resolution for the python modules.
+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
@@ -40,10 +49,22 @@ rm -rf $RPM_BUILD_ROOT
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING NEWS README TODO
%{_bindir}/font-manager
+%{_bindir}/font-sampler
+%{_libdir}/font-manager/
%{_datadir}/font-manager/
%{_datadir}/applications/font-manager.desktop
%changelog
+* Thu Jun 3 2010 Jean-Francois Saucier <jfsaucier at infoglobe.ca> - 0.5.4-3
+- Include some fixes by upstream for the compilation error on x86_64
+
+* 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
+
* Wed Apr 14 2010 Jean-Francois Saucier <jfsaucier at infoglobe.ca> - 0.4.4-1
- Update to new upstream version
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/font-manager/F-13/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources 16 Apr 2010 12:43:37 -0000 1.3
+++ sources 3 Jun 2010 23:35:37 -0000 1.4
@@ -1 +1 @@
-9d866c9d2225a2b32c8470f27c1826cb font-manager-0.4.4.tar.bz2
+4fc07c41176a135c352e6e6ae790e432 font-manager-0.5.4.tar.bz2
--- font-manager-0.4.3-adjust-python-optimization.patch DELETED ---
More information about the scm-commits
mailing list