[libpgf] Update to 6.14.12

Orion Poplawski orion at fedoraproject.org
Mon Feb 23 20:59:01 UTC 2015


commit 3ae741cc74745d8c77894930170a211cadb718e4
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Mon Feb 23 13:59:00 2015 -0700

    Update to 6.14.12

 .gitignore        |  1 +
 libpgf-auto.patch | 44 ++++++++++++++++++++++++++++++++++++++++++++
 libpgf.spec       | 14 +++++++++++---
 sources           |  2 +-
 4 files changed, 57 insertions(+), 4 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 135ba09..af00b1a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 /libpgf-6.12.24-src.tar.gz
 /libpgf-6.12.27-src.tar.gz
 /libpgf-6.13.45-src.tar.gz
+/libpgf-src-6.14.12.tar.gz
diff --git a/libpgf-auto.patch b/libpgf-auto.patch
new file mode 100644
index 0000000..c918a73
--- /dev/null
+++ b/libpgf-auto.patch
@@ -0,0 +1,44 @@
+diff -up libpgf/configure.ac.auto libpgf/configure.ac
+--- libpgf/configure.ac.auto	2014-03-21 07:51:59.000000000 -0600
++++ libpgf/configure.ac	2015-02-23 12:28:53.125766559 -0700
+@@ -1,4 +1,5 @@
+-AC_INIT(src/PGFimage.cpp)
++AC_INIT([libpgf], [6.14.12])
++AC_CONFIG_SRCDIR([src/PGFimage.cpp])
+ 
+ dnl The library interface version
+ dnl see documentation for versioning in the libtool manual
+@@ -24,9 +25,10 @@ PACKAGE_RELEASE=2
+ 
+ AC_SUBST(PACKAGE_RELEASE)
+ 
+-AM_INIT_AUTOMAKE(libpgf,6.14.12)
++AM_INIT_AUTOMAKE
+ AC_PROG_LIBTOOL
+-AC_CONFIG_HEADERS( config.h )
++AC_CONFIG_MACRO_DIR([m4])
++AC_CONFIG_HEADERS( [config.h] )
+ AC_PROG_CXX
+ 
+ dnl Check for doxygen support
+diff -up libpgf/Makefile.am.auto libpgf/Makefile.am
+--- libpgf/Makefile.am.auto	2013-10-25 05:24:18.000000000 -0600
++++ libpgf/Makefile.am	2015-02-23 12:26:04.338856680 -0700
+@@ -19,6 +19,8 @@ RPMEXTRACONFOPT="--disable-dependency-tr
+ 
+ RPMRELEASE=$(PACKAGE_RELEASE)
+ 
++ACLOCAL_AMFLAGS = -I m4
++
+ install-data-local:: $(PACKAGE).pc
+ 	$(mkinstalldirs) $(DESTDIR)$(libdir)/pkgconfig
+ 	$(INSTALL) -m 644 $(PACKAGE).pc $(DESTDIR)$(libdir)/pkgconfig/$(PACKAGE).pc
+diff -up libpgf/src/Makefile.am.auto libpgf/src/Makefile.am
+--- libpgf/src/Makefile.am.auto	2013-10-25 05:24:17.000000000 -0600
++++ libpgf/src/Makefile.am	2015-02-23 12:26:04.338856680 -0700
+@@ -1,4 +1,4 @@
+-INCLUDES	=  -I$(top_srcdir)/include # @PGFCODEC_CFLAGS@
++AM_CPPFLAGS	=  -I$(top_srcdir)/include # @PGFCODEC_CFLAGS@
+ 
+ lib_LTLIBRARIES = libpgf.la
+ libpgf_la_LDFLAGS = -version-info @INTERFACE_VERSION@
diff --git a/libpgf.spec b/libpgf.spec
index ad871a9..0c4f5fa 100644
--- a/libpgf.spec
+++ b/libpgf.spec
@@ -1,12 +1,14 @@
 Name:           libpgf
-Version:        6.13.45
-Release:        0.3.svn123%{?dist}
+Version:        6.14.12
+Release:        1%{?dist}
 Summary:        PGF (Progressive Graphics File) library
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
 URL:            http://www.libpgf.org
-Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}-src.tar.gz
+Source0:        http://downloads.sourceforge.net/%{name}/%{name}-src-%{version}.tar.gz
+# Modernize automake usage
+Patch0:         libpgf-auto.patch
 
 BuildRequires:  doxygen
 BuildRequires:  libtool
@@ -28,6 +30,9 @@ developing applications that use %{name}.
 
 %prep
 %setup -q -n %{name}
+%patch0 -p1 -b .auto
+# Fix line endings
+sed -i -e 's/\r//' configure.ac README
 
 sed -i 's|$(DESTDIR)$(datadir)/doc/$(DOC_MODULE)|$(RPM_BUILD_DIR)/libpgf|g' doc/Makefile.am
 
@@ -66,6 +71,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
 
 %changelog
+* Mon Feb 23 2015 Orion Poplawski <orion at cora.nwra.com> - 6.14.12.1
+- Update to 6.14.12
+
 * Sun Aug 17 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 6.13.45-0.3.svn123
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
 
diff --git a/sources b/sources
index 23bbc77..19575d0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e176355d84a6b5f55365a838cb164ede  libpgf-6.13.45-src.tar.gz
+a2b13832e23ad9026bd249d57b6c26da  libpgf-src-6.14.12.tar.gz


More information about the scm-commits mailing list