rpms/giflib/F-11 giflib.spec, 1.11, 1.12 giflib-hash64.patch, 1.1, NONE

[Robert Scheck]

Author: robert

Update of /cvs/pkgs/rpms/giflib/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1347

Modified Files:
	giflib.spec 
Removed Files:
	giflib-hash64.patch 
Log Message:
- Solved multilib problems with documentation (#465208, #474538)
- Removed static library from giflib-devel package (#225796 #c1)



Index: giflib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/giflib/F-11/giflib.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- giflib.spec	13 Apr 2009 16:13:14 -0000	1.11
+++ giflib.spec	9 May 2009 21:46:09 -0000	1.12
@@ -1,80 +1,74 @@
-Summary: Library for manipulating GIF format image files
-Name: giflib
-Version: 4.1.6
-Release: 1%{?dist}
-License: MIT
-URL: http://www.sf.net/projects/giflib/
-Source0: http://download.sourceforge.net/sourceforge/giflib/%{name}-%{version}.tar.bz2
-Group: System Environment/Libraries
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: libX11-devel, libICE-devel, libSM-devel, libXt-devel
-
-Obsoletes: libungif <= %{version}-%{release}
-Provides: libungif <= %{version}-%{release}
+Summary:	Library for manipulating GIF format image files
+Name:		giflib
+Version:	4.1.6
+Release:	2%{?dist}
+License:	MIT
+Group:		System Environment/Libraries
+URL:		http://www.sourceforge.net/projects/%{name}/
+Source:		http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
+BuildRequires:	libX11-devel, libICE-devel, libSM-devel, libXt-devel
+Provides:	libungif = %{version}-%{release}
+Obsoletes:	libungif <= %{version}-%{release}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
-The giflib package contains a shared library of functions for
-loading and saving GIF format image files.  It is API and ABI compatible
-with libungif, the library which supported uncompressed GIFs while the
-Unisys LZW patent was in effect.
-
-Install the giflib package if you need to write programs that use GIF files.
-You should also install the giflib-utils package if you need some simple
-utilities to manipulate GIFs.
+The giflib package contains a shared library of functions for loading and
+saving GIF format image files. It is API and ABI compatible with libungif,
+the library which supported uncompressed GIFs while the Unisys LZW patent
+was in effect.
 
 %package devel
-Summary: Development tools for programs which will use the libungif library
-Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
-Provides: libungif-devel <= %{version}-%{release}
-Obsoletes: libungif-devel <= %{version}-%{release}
+Summary:	Development tools for programs using the giflib library
+Group:		Development/Libraries
+Requires:	%{name} = %{version}-%{release}
+Provides:	libungif-devel = %{version}-%{release}
+Obsoletes:	libungif-devel <= %{version}-%{release}
 
 %description devel
-This package contains the static libraries, header files and
-documentation necessary for development of programs that will use the
-giflib library to load and save GIF format image files.
-
-You should install this package if you need to develop programs which
-will use giflib library functions.  You'll also need to install the
-giflib package.
+The giflib-devel package includes header files, libraries necessary for
+developing programs which use the giflib library to load and save GIF format
+image files. It contains the documentation of the giflib library, too.
 
 %package utils
-Summary: Programs for manipulating GIF format image files
-Group: Applications/Multimedia
-Requires: %{name} = %{version}-%{release}
-Obsoletes: libungif-progs <= %{version}-%{release}
+Summary:	Programs for manipulating GIF format image files
+Group:		Applications/Multimedia
+Requires:	%{name} = %{version}-%{release}
+Provides:	libungif-progs = %{version}-%{release}
+Obsoletes:	libungif-progs <= %{version}-%{release}
 
 %description utils
-The giflib-utils package contains various programs for manipulating
-GIF format image files.
-
-Install this package if you need to manipulate GIF format image files.
-You'll also need to install the giflib package.
+The giflib-utils package contains various programs for manipulating GIF
+format image files. Install it if you need to manipulate GIF format image
+files.
 
 %prep
 %setup -q
-%{__sed} -i 's/\r//' doc/lzgif.txt
 
 %build
 %configure
 make %{?_smp_mflags} all
 
-MAJOR=`echo '%{version}' | sed 's/\([0-9]\+\)\..*/\1/'`
+# 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
-rm -rf ${RPM_BUILD_ROOT}
+rm -rf $RPM_BUILD_ROOT
+make DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p' install
 
-make install DESTDIR=$RPM_BUILD_ROOT
+# 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
 
-install -m 0755 -p 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
+rm -f $RPM_BUILD_ROOT%{_libdir}/*.{a,la}
 
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+# Remove makefile relics from documentation
+rm -f doc/Makefile*
 
 %clean
-rm -rf ${RPM_BUILD_ROOT}
+rm -rf $RPM_BUILD_ROOT
 
 %post -p /sbin/ldconfig
 
@@ -82,14 +76,12 @@ rm -rf ${RPM_BUILD_ROOT}
 
 %files 
 %defattr(-,root,root,-)
-%doc COPYING README NEWS ONEWS
-%doc ChangeLog TODO BUGS AUTHORS
+%doc AUTHORS ChangeLog COPYING NEWS README
 %{_libdir}/lib*.so.*
 
 %files devel
 %defattr(-,root,root,-)
 %doc doc/* util/giffiltr.c util/gifspnge.c
-%{_libdir}/lib*.a
 %{_libdir}/lib*.so
 %{_includedir}/*.h
 
@@ -98,6 +90,10 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_bindir}/*
 
 %changelog
+* Sat May 09 2009 Robert Scheck <robert at fedoraproject.org> 4.1.6-2
+- Solved multilib problems with documentation (#465208, #474538)
+- Removed static library from giflib-devel package (#225796 #c1)
+
 * Mon Apr 13 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 4.1.6-1
 - update to 4.1.6
 


--- giflib-hash64.patch DELETED ---