rpms/fontforge/FC-3 .cvsignore, 1.5, 1.6 fontforge.spec, 1.8, 1.9 sources, 1.5, 1.6
Owen Taylor (otaylor)
fedora-extras-commits at redhat.com
Tue May 10 19:35:44 UTC 2005
Author: otaylor
Update of /cvs/extras/rpms/fontforge/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv765
Modified Files:
.cvsignore fontforge.spec sources
Log Message:
* Tue May 10 2005 Owen Taylor <otaylor at redhat.com> - 0.0-2.20050502.fc3
- Update to 20050502
- Fix the build to look for the docs where we install them
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fontforge/FC-3/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore 4 Apr 2005 20:25:22 -0000 1.5
+++ .cvsignore 10 May 2005 19:35:42 -0000 1.6
@@ -2,3 +2,5 @@
fontforge_htdocs-20041231.tgz
fontforge_full-20050310.tgz
fontforge_htdocs-20050310.tgz
+fontforge_htdocs-20050503.tgz
+fontforge_full-20050502.tgz
Index: fontforge.spec
===================================================================
RCS file: /cvs/extras/rpms/fontforge/FC-3/fontforge.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- fontforge.spec 4 Apr 2005 20:25:22 -0000 1.8
+++ fontforge.spec 10 May 2005 19:35:42 -0000 1.9
@@ -1,14 +1,14 @@
Name: fontforge
Version: 0.0
-Release: 2.20050310.fc3
+Release: 2.20050502.fc3
Summary: Outline and bitmap font editor
Group: Applications/Publishing
License: BSD
URL: http://fontforge.sourceforge.net/
-Source0: http://dl.sf.net/fontforge/fontforge_full-20050310.tgz
+Source0: http://dl.sf.net/fontforge/fontforge_full-20050502.tgz
Source1: fontforge.desktop
-Source2: http://dl.sf.net/fontforge/fontforge_htdocs-20050310.tgz
+Source2: http://dl.sf.net/fontforge/fontforge_htdocs-20050503.tgz
Patch1: fontforge-20040618-docview.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -31,7 +31,7 @@
(Type2) and CID-keyed fonts.
%prep
-%setup -q -n %{name}-20050310
+%setup -q -n %{name}-20050502
%patch1 -p2 -b .docview
mkdir htdocs
@@ -51,9 +51,10 @@
%build
+export CPPFLAGS='-DDOCDIR=\"%{_docdir}/%{name}-%{version}/htdocs\"'
%configure --with-regular-link --with-freetype-bytecode=no
# Parallel make not working.
-make DOCDIR=%{_docdir}/%{name}-%{version}/htdocs
+make
%install
@@ -74,6 +75,10 @@
chmod -x $RPM_BUILD_ROOT%{_libdir}/pkgconfig/fontforge.pc
+# The fontforge makefiles install htdocs as well, but we
+# prefer to have them under the standard RPM location, so
+# remove the extra copy
+rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/fontforge
%clean
rm -rf $RPM_BUILD_ROOT
@@ -97,6 +102,10 @@
%changelog
+* Tue May 10 2005 Owen Taylor <otaylor at redhat.com> - 0.0-2.20050502.fc3
+- Update to 20050502
+- Fix the build to look for the docs where we install them
+
* Sat Mar 19 2005 Owen Taylor <otaylor at redhat.com> - 0.0-2.20050310
- Update to 20050310
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fontforge/FC-3/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources 4 Apr 2005 20:25:22 -0000 1.5
+++ sources 10 May 2005 19:35:42 -0000 1.6
@@ -1,2 +1,2 @@
-55787a2c60fd84599d316e0311bcb3ae fontforge_full-20050310.tgz
-10e27dbf02be98bddeb3098371e763e1 fontforge_htdocs-20050310.tgz
+1f8de0694c7955ee8de268e70ab70e37 fontforge_htdocs-20050503.tgz
+6a19fe0e0e6c1d70c49014b1f967b481 fontforge_full-20050502.tgz
More information about the fedora-extras-commits
mailing list