- replaced nochown patch by full DESTDIR patch (it fixes paths in manuals)

- some cleanups in package, removed empty %%{_libdir}/ttf2pt1 dir

Changed files:
    ttf2pt1-DESTDIR.patch -> 1.1
    ttf2pt1-nochown.patch -> 1.2
    ttf2pt1.spec -> 1.5

diff --git a/ttf2pt1-DESTDIR.patch b/ttf2pt1-DESTDIR.patch
new file mode 100644 (file)
index 0000000..6b5a86c
--- /dev/null
+++ b/ttf2pt1-DESTDIR.patch
@@ -0,0 +1,57 @@
+--- ttf2pt1-3.4.3/Makefile.orig        Wed Jan 29 21:45:14 2003
++++ ttf2pt1-3.4.3/Makefile     Wed Jan 29 21:56:19 2003
+@@ -130,8 +130,8 @@
+ MANDIR = $(INSTDIR)/man
+ 
+ # owner and group of installed files
+-OWNER = root
+-GROUP = bin
++OWNER = $(shell id -u)
++GROUP = $(shell id -g)
+ 
+ # After you have configured the Makefile, comment out the following
+ # definition:
+@@ -233,31 +233,25 @@
+       scripts/unhtml <FONTS.hpux.html >FONTS.hpux
+ 
+ install: all
+-      scripts/inst_dir $(BINDIR) $(OWNER) $(GROUP) 0755
+-      scripts/inst_dir $(LIBXDIR) $(OWNER) $(GROUP) 0755
+-      scripts/inst_dir $(SHAREDIR) $(OWNER) $(GROUP) 0755
+-      scripts/inst_dir $(MANDIR)/man1 $(OWNER) $(GROUP) 0755
+-      scripts/inst_dir $(MANDIR)/man5 $(OWNER) $(GROUP) 0755
+-      cp -R $(TXTFILES) $(SUBDIRS) $(SHAREDIR)
+-      chown -R $(OWNER) $(SHAREDIR)
+-      chgrp -R $(GROUP) $(SHAREDIR)
+-      chmod -R go-w $(SHAREDIR)
+-      scripts/inst_file ttf2pt1 $(BINDIR)/ttf2pt1 $(OWNER) $(GROUP) 0755
+-      [ -f $(BINDIR)/t1asm ] || scripts/inst_file t1asm $(LIBXDIR)/t1asm $(OWNER) $(GROUP) 0755
++      scripts/inst_dir $(DESTDIR)$(BINDIR) $(OWNER) $(GROUP) 0755
++      scripts/inst_dir $(DESTDIR)$(LIBXDIR) $(OWNER) $(GROUP) 0755
++      scripts/inst_dir $(DESTDIR)$(SHAREDIR) $(OWNER) $(GROUP) 0755
++      scripts/inst_dir $(DESTDIR)$(MANDIR)/man1 $(OWNER) $(GROUP) 0755
++      scripts/inst_dir $(DESTDIR)$(MANDIR)/man5 $(OWNER) $(GROUP) 0755
++      cp -R $(TXTFILES) $(SUBDIRS) $(DESTDIR)$(SHAREDIR)
++      scripts/inst_file ttf2pt1 $(DESTDIR)$(BINDIR)/ttf2pt1 $(OWNER) $(GROUP) 0755
++      [ -f $(BINDIR)/t1asm ] || scripts/inst_file t1asm $(DESTDIR)$(LIBXDIR)/t1asm $(OWNER) $(GROUP) 0755
+       sed 's|^TTF2PT1_BINDIR=$$|TTF2PT1_BINDIR=$(BINDIR)|;\
+               s|^TTF2PT1_LIBXDIR=$$|TTF2PT1_LIBXDIR=$(LIBXDIR)|;\
+               s|^TTF2PT1_SHAREDIR=$$|TTF2PT1_SHAREDIR=$(SHAREDIR)|;' <scripts/convert >cvt.tmp
+-      scripts/inst_file cvt.tmp $(BINDIR)/ttf2pt1_convert $(OWNER) $(GROUP) 0755
+-      scripts/inst_file cvt.tmp $(SHAREDIR)/scripts/convert $(OWNER) $(GROUP) 0755
++      scripts/inst_file cvt.tmp $(DESTDIR)$(BINDIR)/ttf2pt1_convert $(OWNER) $(GROUP) 0755
++      scripts/inst_file cvt.tmp $(DESTDIR)$(SHAREDIR)/scripts/convert $(OWNER) $(GROUP) 0755
+       rm cvt.tmp
+-      scripts/inst_file scripts/x2gs $(BINDIR)/ttf2pt1_x2gs $(OWNER) $(GROUP) 0755
++      scripts/inst_file scripts/x2gs $(DESTDIR)$(BINDIR)/ttf2pt1_x2gs $(OWNER) $(GROUP) 0755
+       for i in $(MANS1); do { \
+               sed 's|TTF2PT1_BINDIR|$(BINDIR)|;\
+                       s|TTF2PT1_LIBXDIR|$(LIBXDIR)|;\
+-                      s|TTF2PT1_SHAREDIR|$(SHAREDIR)|;' <$$i >$(MANDIR)/man1/$$i \
+-              && chown $(OWNER) $(MANDIR)/man1/$$i \
+-              && chgrp $(GROUP) $(MANDIR)/man1/$$i \
+-              && chmod 0644 $(MANDIR)/man1/$$i \
++                      s|TTF2PT1_SHAREDIR|$(SHAREDIR)|;' <$$i >$(DESTDIR)$(MANDIR)/man1/$$i \
+               || exit 1; \
+       } done
+ 

diff --git a/ttf2pt1-nochown.patch b/ttf2pt1-nochown.patch
deleted file mode 100644 (file)
index 56c74d8..0000000
--- a/ttf2pt1-nochown.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- /home/users/hunter/backup/Makefile~        Thu Sep 26 01:28:37 2002
-+++ ../BUILD/ttf2pt1-3.4.2/Makefile    Thu Sep 26 01:30:59 2002
-@@ -238,9 +238,9 @@
-       scripts/inst_dir $(MANDIR)/man1 $(OWNER) $(GROUP) 0755
-       scripts/inst_dir $(MANDIR)/man5 $(OWNER) $(GROUP) 0755
-       cp -R $(TXTFILES) $(SUBDIRS) $(SHAREDIR)
--      chown -R $(OWNER) $(SHAREDIR)
--      chgrp -R $(GROUP) $(SHAREDIR)
--      chmod -R go-w $(SHAREDIR)
-+      #chown -R $(OWNER) $(SHAREDIR)
-+      #chgrp -R $(GROUP) $(SHAREDIR)
-+      #chmod -R go-w $(SHAREDIR)
-       scripts/inst_file ttf2pt1 $(BINDIR)/ttf2pt1 $(OWNER) $(GROUP) 0755
-       [ -f $(BINDIR)/t1asm ] || scripts/inst_file t1asm $(LIBXDIR)/t1asm $(OWNER) $(GROUP) 0755
-       sed 's|^TTF2PT1_BINDIR=$$|TTF2PT1_BINDIR=$(BINDIR)|;\
-@@ -254,9 +254,6 @@
-               sed 's|TTF2PT1_BINDIR|$(BINDIR)|;\
-                       s|TTF2PT1_LIBXDIR|$(LIBXDIR)|;\
-                       s|TTF2PT1_SHAREDIR|$(SHAREDIR)|;' <$$i >$(MANDIR)/man1/$$i \
--              && chown $(OWNER) $(MANDIR)/man1/$$i \
--              && chgrp $(GROUP) $(MANDIR)/man1/$$i \
--              && chmod 0644 $(MANDIR)/man1/$$i \
-               || exit 1; \
-       } done
- 

diff --git a/ttf2pt1.spec b/ttf2pt1.spec
index 34db30494aec42aacbf2aaf657a9059deebe9c78..ab9b03e7ab6f237315f36dbcc8149d51bab21b78 100644 (file)
--- a/ttf2pt1.spec
+++ b/ttf2pt1.spec
@@ -1,14 +1,13 @@
-# TODO: cleanup in %{_datadir}
 Summary:       TrueType to Adobe Type 1 font converter
 Summary(pl):   Konwerter czcionek TrueType do Type1
 Name:          ttf2pt1
-Version:       3.4.2
+Version:       3.4.3
 Release:       1
 License:       Distributable
 Group:         Applications/Printing
-Source0:       http://download.sourceforge.net/ttf2pt1/%{name}-%{version}.tgz
+Source0:       http://dl.sourceforge.net/ttf2pt1/%{name}-%{version}.tgz
 Patch0:                %{name}-am.patch
-Patch1:                %{name}-nochown.patch
+Patch1:                %{name}-DESTDIR.patch
 URL:           http://ttf2pt1.sf.net/
 BuildRequires: freetype-devel >= 2.0.4
 Requires:      t1utils
@@ -22,43 +21,45 @@ True Type Font to Adobe Type 1 font converter
  - With help from Frank M. Siegert <fms@this.net>
 
 %description -l pl
-Konwerter czcionek TrueType do Type1 autorstwa Marka Heatha
+Konwerter fontów TrueType do Type1 autorstwa Marka Heatha
 <mheath@netspace.net.au>, oparty o ttf2pfa autorstwa Andrew Weeksa
 <ccsaw@bath.ac.uk>, z pomoc± Franka M. Siegerta <fms@this.net>.
 
 %prep
 %setup -q
 %patch0 -p0
-%patch1 -p3
+%patch1 -p1
 
 %build
 %{__make} ttf2pt1 docs mans \
-               CFLAGS_EXTT1ASM='-DEXTERNAL_T1ASM' \
-               CC="%{__cc}" \
-               CFLAGS_SYS='%{rpmcflags} -D_GNU_SOURCE' \
-               LIBS_SYS='-lm' \
-               CFLAGS_FT='-DUSE_FREETYPE -I/usr/include/freetype2' \
-               CFLAGS_PREF='-DPREFER_FREETYPE' \
-               LIBS_FT='-L/usr/lib -lfreetype'
+       CFLAGS_EXTT1ASM='-DEXTERNAL_T1ASM' \
+       CC="%{__cc}" \
+       CFLAGS_SYS='%{rpmcflags} -D_GNU_SOURCE' \
+       LIBS_SYS='-lm' \
+       CFLAGS_FT='-DUSE_FREETYPE -I/usr/include/freetype2' \
+       CFLAGS_PREF='-DPREFER_FREETYPE' \
+       LIBS_FT='-L/usr/lib -lfreetype' \
+       INSTDIR=%{_prefix}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} install INSTDIR=$RPM_BUILD_ROOT%{_prefix} \
-               BINDIR=$RPM_BUILD_ROOT%{_bindir} \
-               LIBXDIR=$RPM_BUILD_ROOT%{_libdir}/ttf2pt1 \
-               SHAREDIR=$RPM_BUILD_ROOT%{_datadir}/ttf2pt1 \
-               MANDIR=$RPM_BUILD_ROOT%{_mandir} \
-               OWNER=`id -u` \
-               GROUP=`id -g`
+%{__make} install \
+       DESTDIR=$RPM_BUILD_ROOT \
+       INSTDIR=%{_prefix} \
+       MANDIR=%{_mandir} \
+       SHAREDIR=%{_datadir}/ttf2pt1 \
+       LIBXDIR=%{_libdir}/ttf2pt1
+
+# clean up the mess
+rm -rf $RPM_BUILD_ROOT%{_datadir}/ttf2pt1/{app,other,scripts,[CFR]*}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc README README.html
-%attr(755,root,root) %{_bindir}/*
-%attr(755,root,root) %{_libdir}/ttf2pt1
+%doc CHANGES.html COPYRIGHT FONTS.html README.html
+%attr(755,root,root) %{_bindir}/ttf2pt1*
 %{_datadir}/ttf2pt1
 %{_mandir}/man1/*