diff --git a/.gitignore b/.gitignore index 596e41a..cd5213f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ giflib-4.1.6.tar.bz2 /giflib-5.1.4.tar.bz2 +/giflib-5.1.6.tar.gz diff --git a/giflib.spec b/giflib.spec index 0117272..c3e1f2d 100644 --- a/giflib.spec +++ b/giflib.spec @@ -1,11 +1,14 @@ Name: giflib Summary: A library and utilities for processing GIFs -Version: 5.1.4 -Release: 3%{?dist} +Version: 5.1.6 +Release: 1%{?dist} License: MIT URL: http://www.sourceforge.net/projects/%{name}/ -Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2 +Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz + +# Instal *.1 manpages to mandir/man1 +Patch0: giflib_mandir.patch BuildRequires: gcc BuildRequires: make @@ -39,27 +42,21 @@ format image files. %build -%configure -sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool -sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool -%make_build +%make_build CFLAGS="%{optflags} -fPIC" LDFLAGS="%{__global_ldflags}" %install -%make_install +%make_install PREFIX="%{_prefix}" LIBDIR="%{_libdir}" -# Don't install any static .a and libtool .la files -rm -f %{buildroot}%{_libdir}/*.{a,la} - -# Remove makefile relics from documentation -rm -f doc/Makefile* +# Drop static library +rm -f %{buildroot}%{_libdir}/libgif.a %ldconfig_scriptlets -%files -%doc AUTHORS ChangeLog NEWS README +%files +%doc ChangeLog NEWS README %license COPYING %{_libdir}/libgif.so.7* @@ -70,10 +67,13 @@ rm -f doc/Makefile* %files utils %{_bindir}/gif* -%{_mandir}/man1/gif*.1* +%{_mandir}/man1/*.1* %changelog +* Mon Feb 18 2019 Sandro Mani - 5.1.6-1 +- Update to 5.1.6 + * Thu Jan 31 2019 Fedora Release Engineering - 5.1.4-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/giflib_mandir.patch b/giflib_mandir.patch new file mode 100644 index 0000000..b10fc7b --- /dev/null +++ b/giflib_mandir.patch @@ -0,0 +1,23 @@ +diff -rupN giflib-5.1.6/Makefile giflib-5.1.6-new/Makefile +--- giflib-5.1.6/Makefile 2019-02-12 15:26:13.000000000 +0100 ++++ giflib-5.1.6-new/Makefile 2019-02-23 18:43:34.425669380 +0100 +@@ -96,8 +96,8 @@ install-lib: + ln -sf libgif.so.$(LIBVER) "$(DESTDIR)$(LIBDIR)/libgif.so.$(LIBMAJOR)" + ln -sf libgif.so.$(LIBMAJOR) "$(DESTDIR)$(LIBDIR)/libgif.so" + install-man: +- $(INSTALL) -d "$(DESTDIR)$(MANDIR)" +- $(INSTALL) -m 644 doc/*.1 "$(DESTDIR)$(MANDIR)" ++ $(INSTALL) -d "$(DESTDIR)$(MANDIR)/man1" ++ $(INSTALL) -m 644 doc/*.1 "$(DESTDIR)$(MANDIR)/man1" + uninstall: uninstall-man uninstall-include uninstall-lib uninstall-bin + uninstall-bin: + cd "$(DESTDIR)$(BINDIR)" && rm -f $(INSTALLABLE) +@@ -107,7 +107,7 @@ uninstall-lib: + cd "$(DESTDIR)$(LIBDIR)" && \ + rm -f libgif.a libgif.so libgif.so.$(LIBMAJOR) libgif.so.$(LIBVER) + uninstall-man: +- cd "$(DESTDIR)$(MANDIR)" && rm -f $(shell cd doc >/dev/null && echo *.1) ++ cd "$(DESTDIR)$(MANDIR)/man1" && rm -f $(shell cd doc >/dev/null && echo *.1) + + # Make distribution tarball + # diff --git a/sources b/sources index a2edad6..338e5a4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (giflib-5.1.4.tar.bz2) = 32b5e342056c210e6478e9cb3b6ceec9594dcfaf34feea1eb4dad633a081ed4465bceee578c19165907cb47cb83912ac359ceea666a8e07dbbb5420f9928f96d +SHA512 (giflib-5.1.6.tar.gz) = a148e3ebee6ad00ac24eb2241e5d7f51c0a22e6e931ebd751ca57b921a2a3d1a17a6d1e0e949ca0401589b539ec1458a57a9e306fadaf03dcd2ec40c11ca28be