Revert "- Upgrade to 5.0.5 (#822844)"

Revert this for the time being as it needs to be properly planned and as it's not in rawhide yet it'll likely just break things if it gets built in something like a mass rebuild

This reverts commit 48f0569c4a.
This commit is contained in:
Peter Robinson 2013-12-18 11:32:13 +00:00
parent 48f0569c4a
commit 2d3809225d
3 changed files with 25 additions and 19 deletions

2
.gitignore vendored
View File

@ -1 +1 @@
/giflib-?.?.?.tar.bz2 giflib-4.1.6.tar.bz2

View File

@ -1,24 +1,27 @@
Summary: Library for manipulating GIF format image files Summary: Library for manipulating GIF format image files
Name: giflib Name: giflib
Version: 5.0.5 Version: 4.1.6
Release: 1%{?dist} Release: 9%{?dist}
License: MIT License: MIT
Group: System Environment/Libraries Group: System Environment/Libraries
URL: http://www.sourceforge.net/projects/%{name}/ 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.bz2
BuildRequires: libX11-devel, libICE-devel, libSM-devel, libXt-devel BuildRequires: libX11-devel, libICE-devel, libSM-devel, libXt-devel
Provides: libungif = %{version}-%{release}
Obsoletes: libungif <= %{version}-%{release} Obsoletes: libungif <= %{version}-%{release}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%description %description
The giflib package contains a shared library of functions for reading GIF The giflib package contains a shared library of functions for loading and
files, transforming them into RGB bitmaps and and for writing RGB bitmaps saving GIF format image files. It is API and ABI compatible with libungif,
as GIF files. the library which supported uncompressed GIFs while the Unisys LZW patent
was in effect.
%package devel %package devel
Summary: Development tools for programs using the giflib library Summary: Development tools for programs using the giflib library
Group: Development/Libraries Group: Development/Libraries
Requires: %{name}%{?_isa} = %{version}-%{release} Requires: %{name} = %{version}-%{release}
Provides: libungif-devel = %{version}-%{release}
Obsoletes: libungif-devel <= %{version}-%{release} Obsoletes: libungif-devel <= %{version}-%{release}
%description devel %description devel
@ -29,7 +32,8 @@ image files. It contains the documentation of the giflib library, too.
%package utils %package utils
Summary: Programs for manipulating GIF format image files Summary: Programs for manipulating GIF format image files
Group: Applications/Multimedia Group: Applications/Multimedia
Requires: %{name}%{?_isa} = %{version}-%{release} Requires: %{name} = %{version}-%{release}
Provides: libungif-progs = %{version}-%{release}
Obsoletes: libungif-progs <= %{version}-%{release} Obsoletes: libungif-progs <= %{version}-%{release}
%description utils %description utils
@ -44,16 +48,24 @@ files.
%configure %configure
make %{?_smp_mflags} all make %{?_smp_mflags} all
# Handling of libungif compatibility
MAJOR=`echo '%{version}' | sed -e 's/\([0-9]\+\)\..*/\1/'`
%{__cc} $RPM_OPT_FLAGS -shared -Wl,-soname,libungif.so.$MAJOR -Llib/.libs -lgif -o libungif.so.%{version}
%install %install
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p' install make DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p' install
make -C doc DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p' install-man
# Handling of libungif compatibility
install -p -m 755 libungif.so.%{version} $RPM_BUILD_ROOT%{_libdir}
ln -sf libungif.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libungif.so.4
ln -sf libungif.so.4 $RPM_BUILD_ROOT%{_libdir}/libungif.so
# Don't install any static .a and libtool .la files # Don't install any static .a and libtool .la files
rm -f $RPM_BUILD_ROOT%{_libdir}/*.{a,la} rm -f $RPM_BUILD_ROOT%{_libdir}/*.{a,la}
# Clean up for later usage in documentation # Remove makefile relics from documentation
rm -f doc/Makefile* doc/*.1 rm -f doc/Makefile*
%clean %clean
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
@ -69,21 +81,15 @@ rm -rf $RPM_BUILD_ROOT
%files devel %files devel
%defattr(-,root,root,-) %defattr(-,root,root,-)
%doc doc/* util/giffilter.c util/gifsponge.c %doc doc/* util/giffiltr.c util/gifspnge.c
%{_libdir}/lib*.so %{_libdir}/lib*.so
%{_includedir}/*.h %{_includedir}/*.h
%files utils %files utils
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{_bindir}/* %{_bindir}/*
%{_mandir}/man1/*.1*
%changelog %changelog
* Mon Nov 25 2013 Robert Scheck <robert@fedoraproject.org> 5.0.5-1
- Upgrade to 5.0.5 (#822844)
- Tight run-time dependencies between sub-packages via %%{?_isa}
- Only obsolete but no longer provide any libungif packages
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.1.6-9 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.1.6-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild

View File

@ -1 +1 @@
c3262ba0a3dad31ba876fb5ba1d71a02 giflib-5.0.5.tar.bz2 7125644155ae6ad33dbc9fc15a14735f giflib-4.1.6.tar.bz2