commit a8301e94772153b3d708cd9d80f9bbf4314e96f1 Author: Jakub Bogusz <qbo...@pld-linux.org> Date: Fri Mar 7 19:36:14 2014 +0100
- updated to 3.5.22 - updated ac_fixes,no-Werror patches ifhp-ac_fixes.patch | 4 ++-- ifhp-no-Werror.patch | 4 ++-- ifhp.spec | 23 ++++++++++------------- 3 files changed, 14 insertions(+), 17 deletions(-) --- diff --git a/ifhp.spec b/ifhp.spec index 0effc2f..c2d9abe 100644 --- a/ifhp.spec +++ b/ifhp.spec @@ -1,24 +1,20 @@ -# -# WARNING; -# DO NOT update this to 3.5.22, that release is broken. -# +# WARNING: broken release (how?) %include /usr/lib/rpm/macros.perl Summary: Print filter for HP postscript, text, and other printers Summary(pl.UTF-8): Filtr wydruku HP postscriptu, tekstu i innych drukarek Name: ifhp -Version: 3.5.20 -Release: 5 +Version: 3.5.22 +Release: 1 License: GPL v2 or Artistic -Vendor: Astart Technologies, San Diego, CA 92123 http://www.astart.com/ Group: Applications/System Source0: http://www.lprng.com/DISTRIB/ifhp/%{name}-%{version}.tgz -# Source0-md5: 25b151b3adb953b571e6b0a7cc9937f3 +# Source0-md5: 450b24f44dffbfda84a58ce5067ab1ad Patch0: %{name}-ac_fixes.patch Patch1: %{name}-trim_cmdline.patch Patch2: %{name}-no-Werror.patch Patch3: %{name}-a4.patch URL: http://www.lprng.com/ -BuildRequires: autoconf +BuildRequires: autoconf >= 2.50 BuildRequires: automake BuildRequires: gettext-tools BuildRequires: ghostscript @@ -83,7 +79,7 @@ install -d $RPM_BUILD_ROOT%{_sysconfdir} # some random junk and docs %{__rm} $RPM_BUILD_ROOT%{lpfiltersdir}/UTILS/{400095.ppd,HP2500CJ.PPD,Watermarks,accounting.sh.in,extract_pjl,fixupdate.in,install-sh,mkinstalldirs,sendhp.sh.in,stopstr.c,supported.in,test1,use_snmp_for_status} -# not installed +# only empty file installed #%find_lang %{name} %clean @@ -92,7 +88,7 @@ rm -rf $RPM_BUILD_ROOT #%files -f %{name}.lang %files %defattr(644,root,root,755) -%doc README ifhp.conf.sample DOCS/*.{html,jpg} +%doc CHANGES README* ifhp.conf.sample DOCS/*.{html,jpg} UTILS/{Watermarks,use_snmp_for_status} # HOWTO/*.html %attr(755,root,root) %{_bindir}/extract_pjl %attr(755,root,root) %{_bindir}/snmp_printer_status @@ -111,5 +107,6 @@ rm -rf $RPM_BUILD_ROOT %{lpfiltersdir}/UTILS/ellipse.ps %{lpfiltersdir}/UTILS/one.* %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.conf -%{_mandir}/man8/ifhp.8* -%{_mandir}/man8/textps.8* +%{_mandir}/man1/ifhp.1* +%{_mandir}/man1/snmp_printer_status.1* +%{_mandir}/man1/textps.1* diff --git a/ifhp-ac_fixes.patch b/ifhp-ac_fixes.patch index 2e17357..2a1fd2f 100644 --- a/ifhp-ac_fixes.patch +++ b/ifhp-ac_fixes.patch @@ -1,5 +1,5 @@ ---- ifhp-3.5.11/configure.in.orig 2003-09-05 22:05:42.000000000 +0200 -+++ ifhp-3.5.11/configure.in 2003-10-06 21:15:24.731523552 +0200 +--- ifhp-3.5.22/configure.ac.orig 2003-09-05 22:05:42.000000000 +0200 ++++ ifhp-3.5.22/configure.ac 2003-10-06 21:15:24.731523552 +0200 @@ -119,22 +119,7 @@ AC_MSG_RESULT($FONT_DIR) AC_SUBST(FONT_DIR) diff --git a/ifhp-no-Werror.patch b/ifhp-no-Werror.patch index 96eef0d..5df1c7e 100644 --- a/ifhp-no-Werror.patch +++ b/ifhp-no-Werror.patch @@ -1,5 +1,5 @@ ---- ifhp-3.5.20/configure.in~ 2007-06-22 13:21:31.000000000 +0200 -+++ ifhp-3.5.20/configure.in 2007-06-22 13:26:21.000000000 +0200 +--- ifhp-3.5.22/configure.ac~ 2007-06-22 13:21:31.000000000 +0200 ++++ ifhp-3.5.22/configure.ac 2007-06-22 13:26:21.000000000 +0200 @@ -1225,8 +1225,8 @@ ================================================================ ---- gitweb: http://git.pld-linux.org/gitweb.cgi/packages/ifhp.git/commitdiff/a8301e94772153b3d708cd9d80f9bbf4314e96f1 _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit