From 56dbda81f7d1a939b157ac1eae794fd4a2c04c4a Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Tue, 4 Feb 2014 21:05:56 +0100 Subject: [PATCH] - updated to 2.0.2 (note: new soname; libmng 1.0.x left on libmng-1 branch) - updated automake patch - added jpeg patch (include before including , which uses FILE) --- libmng-automake.patch | 14 ++++++++------ libmng-jpeg.patch | 10 ++++++++++ libmng.spec | 23 +++++++++++++---------- 3 files changed, 31 insertions(+), 16 deletions(-) create mode 100644 libmng-jpeg.patch diff --git a/libmng-automake.patch b/libmng-automake.patch index 73663ac..f680c09 100644 --- a/libmng-automake.patch +++ b/libmng-automake.patch @@ -12,14 +12,16 @@ # libmng release @VERSION@ ---- libmng-1.0.10/makefiles/configure.in.orig 2005-01-30 11:28:00.000000000 +0100 -+++ libmng-1.0.10/makefiles/configure.in 2007-07-16 19:43:24.774854842 +0200 -@@ -189,5 +189,5 @@ - +--- libmng-2.0.2/makefiles/configure.ac.orig 2014-02-04 18:36:36.404372468 +0100 ++++ libmng-2.0.2/makefiles/configure.ac 2014-02-04 19:49:51.950854671 +0100 +@@ -250,6 +250,8 @@ test $_restore -eq 1 && CPPFLAGS=$_cppflags LDFLAGS=$_ldflags --AC_CONFIG_FILES([Makefile]) -+ AC_CONFIG_FILES([Makefile doc/Makefile doc/man/Makefile]) + AC_CONFIG_FILES([Makefile ++ doc/Makefile ++ doc/man/Makefile + libmng.pc:libmng.pc.in + ]) AC_OUTPUT diff -Nru libmng-1.0.5.orig/doc/makefiles/Makefile.am libmng-1.0.5/doc/makefiles/Makefile.am --- libmng-1.0.5.orig/doc/makefiles/Makefile.am Thu Jan 1 01:00:00 1970 diff --git a/libmng-jpeg.patch b/libmng-jpeg.patch new file mode 100644 index 0000000..fc797fd --- /dev/null +++ b/libmng-jpeg.patch @@ -0,0 +1,10 @@ +--- libmng-2.0.2/libmng_types.h.orig 2013-01-20 04:45:24.000000000 +0100 ++++ libmng-2.0.2/libmng_types.h 2014-02-04 20:32:50.977413106 +0100 +@@ -204,6 +204,7 @@ + #define HAVE_BOOLEAN + typedef int boolean; + #endif ++#include + #include + #endif /* MNG_INCLUDE_IJG6B */ + diff --git a/libmng.spec b/libmng.spec index c261e97..3a27f8c 100644 --- a/libmng.spec +++ b/libmng.spec @@ -10,18 +10,19 @@ Summary(pl.UTF-8): Biblioteka do obróbki plików w formacie MNG Summary(uk.UTF-8): Бібліотека функцій для роботи з файлами у форматі MNG Summary(ru.UTF-8): Библиотека функций для работы с файлами в формате MNG Name: libmng -Version: 1.0.10 -Release: 7 +Version: 2.0.2 +Release: 1 License: BSD-like Group: Libraries -Source0: http://downloads.sourceforge.net/libmng/%{name}-%{version}.tar.gz -# Source0-md5: a464ae7d679781beebdf7440d144b7bd +Source0: http://downloads.sourceforge.net/libmng/%{name}-%{version}.tar.xz +# Source0-md5: 3804bf2523af9b4e0670b5982b3bf984 Patch0: %{name}-automake.patch Patch1: %{name}-gcc4.patch +Patch2: %{name}-jpeg.patch URL: http://www.libmng.com/ -BuildRequires: autoconf >= 2.50 +BuildRequires: autoconf >= 2.65 BuildRequires: automake >= 1.3 -BuildRequires: lcms-devel +BuildRequires: lcms2-devel >= 2 BuildRequires: libjpeg-devel BuildRequires: libtool BuildRequires: zlib-devel @@ -61,7 +62,7 @@ Summary(ru.UTF-8): Средства разработки для программ Summary(uk.UTF-8): Засоби розробки для роботи з програмами, що працюють з файлами у форматі MNG Group: Development/Libraries Requires: %{name} = %{version}-%{release} -Requires: lcms-devel +Requires: lcms2-devel >= 2 Requires: libjpeg-devel Requires: zlib-devel Obsoletes: libmng1-devel @@ -163,10 +164,11 @@ mngplay - przeglądarka plików MNG oparta na SDL. %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 %build -cp makefiles/{Makefile.am,configure.in} . -sed -i '/AM_C_PROTOTYPES/d' configure.in +cp makefiles/{Makefile.am,configure.ac} . +#sed -i '/AM_C_PROTOTYPES/d' configure.in cp doc/makefiles/Makefile.am doc cp doc/man/makefiles/Makefile.am doc/man %{__libtoolize} @@ -229,7 +231,7 @@ rm -rf $RPM_BUILD_ROOT %defattr(644,root,root,755) %doc CHANGES LICENSE README %attr(755,root,root) %{_libdir}/libmng.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libmng.so.1 +%attr(755,root,root) %ghost %{_libdir}/libmng.so.2 %{_mandir}/man5/jng.5* %{_mandir}/man5/mng.5* @@ -239,6 +241,7 @@ rm -rf $RPM_BUILD_ROOT %attr(755,root,root) %{_libdir}/libmng.so %{_libdir}/libmng.la %{_includedir}/libmng*.h +%{_pkgconfigdir}/libmng.pc %{_mandir}/man3/libmng.3* %if %{with static_libs} -- 2.44.0