[psutils/f18] various spec file fixes
Jiří Popelka
jpopelka at fedoraproject.org
Thu Nov 29 13:43:14 UTC 2012
commit 9c542e7268509c52bfead50dcf3e9729cfa029ad
Author: Jiri Popelka <jpopelka at redhat.com>
Date: Thu Nov 29 14:35:29 2012 +0100
various spec file fixes
- fix dist tag and URL
- put psutils-copyright.patch among sources as it's used only in
psutils-remove-copyrighted-files
- no need to define BuildRoot and clean it in %clean and %install anymore
- %defattr no longer needed in %files
psutils.spec | 21 ++++++++++-----------
1 files changed, 10 insertions(+), 11 deletions(-)
---
diff --git a/psutils.spec b/psutils.spec
index 4650c90..e0df04c 100644
--- a/psutils.spec
+++ b/psutils.spec
@@ -1,7 +1,7 @@
Summary: PostScript Utilities
Name: psutils
Version: 1.17
-Release: 39%{dist}
+Release: 40%{?dist}
License: psutils
Group: Applications/Publishing
# We cannot use the upstream tarball because it contains non-free files.
@@ -9,7 +9,8 @@ Group: Applications/Publishing
#Source: ftp://ftp.knackered.org/pub/psutils/psutils-p17.tar.gz
Source0: psutils-p17-clean.tar.gz
Source1: psutils-remove-copyrighted-files
-URL: http://www.tardis.ed.ac.uk/~ajcd/psutils/
+Source2: psutils-copyright.patch
+URL: http://knackered.org/angus/psutils/
Patch0: psutils-p17-Makefile.patch
Patch1: psutils-p17-misc.patch
Patch2: psutils-p17-paper.patch
@@ -17,8 +18,6 @@ Patch3: psutils-p17-strip.patch
Patch4: psutils-manpage.patch
Patch5: psutils-psmerge.patch
Patch6: psutils-datadir.patch
-Patch7: psutils-copyright.patch
-BuildRoot: %{_tmppath}/psutils-root
%description
This archive contains some utilities for manipulating PostScript documents.
@@ -47,17 +46,11 @@ Various scripts from the psutils distribution that require perl.
make -f Makefile.unix RPM_OPT_FLAGS="$RPM_OPT_FLAGS"
%install
-rm -rf $RPM_BUILD_ROOT
-
make -f Makefile.unix \
MANDIR=$RPM_BUILD_ROOT%{_mandir}/man1 \
DESTDIR=$RPM_BUILD_ROOT install
-%clean
-rm -rf $RPM_BUILD_ROOT
-
%files
-%defattr(-, root, root, -)
%doc README LICENSE
%{_bindir}/epsffit
%{_bindir}/getafm
@@ -77,7 +70,6 @@ rm -rf $RPM_BUILD_ROOT
#{_mandir}/man1/showchar.1*
%files perl
-%defattr(-, root, root, -)
%doc LICENSE
%{_bindir}/extractres
%{_bindir}/fixdlsrps
@@ -109,6 +101,13 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Thu Nov 29 2012 Jiri Popelka <jpopelka at redhat.com> - 1.17-40
+- fix dist tag and URL
+- put psutils-copyright.patch among sources as it's used only in
+ psutils-remove-copyrighted-files
+- no need to define BuildRoot and clean it in %%clean and %%install anymore
+- %%defattr no longer needed in %%files
+
* Sat Jul 21 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.17-39
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
More information about the scm-commits
mailing list