[meego-commits] 5313: Changes to Trunk:Testing/zlib
Yan Yin
yan.yin at intel.com
Fri Jul 2 08:56:07 UTC 2010
Hi,
I have made the following changes to zlib in project Trunk:Testing. Please review and accept ASAP.
Thank You,
Yan Yin
[This message was auto-generated]
---
Request #5313:
submit: home:yyin2:branches:Trunk:Testing/zlib(r2)(cleanup) -> Trunk:Testing/zlib
Message:
Upgrade to 1.2.5, drop old patches, keep profile guided optmization
State: new 2010-07-01T20:52:22 yyin2
Comment: None
changes files:
--------------
--- zlib.changes
+++ zlib.changes
@@ -0,0 +1,3 @@
+* Fri Jul 02 2010 Yan Yin <yan.yin at intel.com> - 1.2.5
+- Upgrade to 1.2.5, drop old patches, keep profile guided optmization
+
old:
----
buildfix.patch
minizip-1.2.3-autotools.patch
zlib-1.2.3-autotools.patch
zlib-1.2.3-minizip.patch
zlib-1.2.3.tar.gz
new:
----
zlib-1.2.4-autotools.patch
zlib-1.2.5.tar.gz
spec files:
-----------
--- zlib.spec
+++ zlib.spec
@@ -1,48 +1,44 @@
-#specfile originally created for Fedora, modified for Moblin Linux
-Summary: The zlib compression and decompression library
+%define keepstatic 1
+
Name: zlib
-Version: 1.2.3
-Release: 18
+Summary: The zlib compression and decompression library
+Version: 1.2.5
+Release: 1
Group: System/Libraries
-Source: http://www.zlib.net/zlib-%{version}.tar.gz
-Patch3: zlib-1.2.3-autotools.patch
-Patch4: minizip-1.2.3-autotools.patch
-Patch5: zlib-1.2.3-minizip.patch
-Patch6: buildfix.patch
+License: zlib and Boost
URL: http://www.gzip.org/zlib/
-License: zlib
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires(post): ldconfig
-Requires(postun): ldconfig
+Source0: http://www.zlib.net/zlib-%{version}.tar.gz
+Patch0: zlib-1.2.4-autotools.patch
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
+BuildRequires: automake
+BuildRequires: autoconf
+BuildRequires: libtool
+
%description
Zlib is a general-purpose, patent-free, lossless data compression
library which is used by many different programs.
-%package devel
-Summary: Header files and libraries for Zlib development
-Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
-%description devel
-The zlib-devel package contains the header files and libraries needed
-to develop programs that use the zlib compression and decompression
-library.
%package static
Summary: Static libraries for Zlib development
Group: Development/Libraries
-Requires: %{name}-devel = %{version}-%{release}
+Requires: %{name} = %{version}-%{release}
%description static
The zlib-static package includes static libraries needed
to develop programs that use the zlib compression and
decompression library.
+
%package -n minizip
Summary: Minizip manipulates files from a .zip archive
Group: System/Libraries
-Requires: zlib = %{version}-%{release}
+Requires: %{name} = %{version}-%{release}
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
%description -n minizip
Minizip manipulates files from a .zip archive.
@@ -50,27 +46,37 @@
%package -n minizip-devel
Summary: Development files for the minizip library
Group: Development/Libraries
-Requires: minizip = %{version}-%{release}
-Requires: zlib-devel = %{version}-%{release}
-Requires: pkgconfig
+Requires: %{name} = %{version}-%{release}
%description -n minizip-devel
This package contains the libraries and header files needed for
developing applications which use minizip.
+
+%package devel
+Summary: Header files and libraries for Zlib development
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+
+%description devel
+The zlib-devel package contains the header files and libraries needed
+to develop programs that use the zlib compression and decompression
+library.
+
+
+
%prep
-%setup -q
-%patch3 -p1 -b .autotools
-%patch4 -p1 -b .autotools2
-%patch5 -p1 -b .inc
-%patch6 -p1 -b .buildfix
+%setup -q -n %{name}-%{version}
+# zlib-1.2.4-autotools.patch
+%patch0 -p1
+mkdir contrib/minizip/m4
+cp minigzip.c contrib/minizip
iconv -f windows-1252 -t utf-8 <ChangeLog >ChangeLog.tmp
mv ChangeLog.tmp ChangeLog
-cp Makefile Makefile.old
%build
-%reconfigure
+CFLAGS=$RPM_OPT_FLAGS ./configure --libdir=%{_libdir} --includedir=%{_includedir} --prefix=%{_prefix}
#
# first,build with -fprofile-generate to create the profile data
@@ -82,6 +88,7 @@
# to collect the profile guided stats
# (in this case, we compress and decompress the content of /usr/bin)
#
+cp Makefile Makefile.old
make test -f Makefile.old LDFLAGS="libz.a -lgcov"
cat /usr/bin/* | ./minigzip | ./minigzip -d &> /dev/null
@@ -99,73 +106,48 @@
make %{?_smp_mflags} CFLAGS="$CFLAGS -fprofile-use"
-
cd contrib/minizip
-export CPPFLAGS="-I../.."
-export LDFLAGS="-L../.."
-sh autogen.sh
-%configure --enable-static=no
-#
-# the minizip package is broken for parallel build
-#
-make
-
-%check
-make test -f Makefile.old
+%reconfigure
+make %{?_smp_mflags}
%install
rm -rf ${RPM_BUILD_ROOT}
+%make_install
-make install DESTDIR=$RPM_BUILD_ROOT libdir=/%{_lib}
-
-mkdir $RPM_BUILD_ROOT%{_prefix}
-mkdir $RPM_BUILD_ROOT%{_libdir}/
-mv $RPM_BUILD_ROOT/%{_lib}/libz.a $RPM_BUILD_ROOT/%{_libdir}/
-mv $RPM_BUILD_ROOT/%{_lib}/libz.so $RPM_BUILD_ROOT/%{_libdir}/
+mkdir $RPM_BUILD_ROOT/%{_lib}
+mv $RPM_BUILD_ROOT%{_libdir}/libz.so.* $RPM_BUILD_ROOT/%{_lib}/
-ln -sf ../../%{_lib}/libz.so.%{version} $RPM_BUILD_ROOT/%{_libdir}/libz.so
+reldir=$(echo %{_libdir} | sed 's,/$,,;s,/[^/]\+,../,g')%{_lib}
+oldlink=$(readlink $RPM_BUILD_ROOT%{_libdir}/libz.so)
+ln -sf $reldir/$(basename $oldlink) $RPM_BUILD_ROOT%{_libdir}/libz.so
-mkdir -p ${RPM_BUILD_ROOT}%{_includedir}
-cp -p zconf.h ${RPM_BUILD_ROOT}%{_includedir}
-cp -p zlib.h ${RPM_BUILD_ROOT}%{_includedir}
-
-mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man3
-cp -p zlib.3 ${RPM_BUILD_ROOT}%{_mandir}/man3
-
-# Remove unuseful files created by libtool
-rm -f $RPM_BUILD_ROOT/%{_lib}/libz.la
-
-# install minizip subpackage
cd contrib/minizip
+make install DESTDIR=$RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
-rm -f $RPM_BUILD_ROOT/%{_bindir}/miniunzip
-rm -f $RPM_BUILD_ROOT/%{_bindir}/minizip
-rm -f $RPM_BUILD_ROOT/%{_libdir}/libminizip.la
+rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
-%clean
-rm -rf ${RPM_BUILD_ROOT}
+%check
+make test
+
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
+
%post -n minizip -p /sbin/ldconfig
%postun -n minizip -p /sbin/ldconfig
+
+
+
%files
%defattr(-,root,root,-)
+%doc README ChangeLog FAQ
/%{_lib}/libz.so.*
-%files devel
-%defattr(-,root,root,-)
-%doc README ChangeLog FAQ
-%{_libdir}/libz.so
-%{_includedir}/zconf.h
-%{_includedir}/zlib.h
-%doc %{_mandir}/man3/zlib.3*
%files static
%defattr(-,root,root,-)
@@ -174,7 +156,7 @@
%files -n minizip
%defattr(-,root,root,-)
-%doc contrib/minizip/ChangeLogUnzip
+%doc contrib/minizip/MiniZip64_info.txt contrib/minizip/MiniZip64_Changes.txt
%{_libdir}/libminizip.so.*
%files -n minizip-devel
@@ -184,3 +166,12 @@
%{_libdir}/libminizip.so
%{_libdir}/pkgconfig/minizip.pc
+%files devel
+%defattr(-,root,root,-)
+%doc README doc/algorithm.txt example.c
+%{_libdir}/libz.so
+%{_includedir}/zconf.h
+%{_includedir}/zlib.h
+%{_mandir}/man3/zlib.3*
+%{_libdir}/pkgconfig/zlib.pc
+
other changes:
--------------
++++++ zlib-1.2.4-autotools.patch (new)
--- zlib-1.2.4-autotools.patch
+++ zlib-1.2.4-autotools.patch
+diff -up zlib-1.2.4/contrib/minizip/configure.ac.atools zlib-1.2.4/contrib/minizip/configure.ac
+--- zlib-1.2.4/contrib/minizip/configure.ac.atools 2010-03-29 10:28:50.000000000 +0200
++++ zlib-1.2.4/contrib/minizip/configure.ac 2010-03-29 10:28:50.000000000 +0200
+@@ -0,0 +1,13 @@
++# -*- Autoconf -*-
++# Process this file with autoconf to produce a configure script.
++
++AC_INIT([minizip], [1.2.4], [bugzilla.redhat.com])
++AC_CONFIG_SRCDIR([minigzip.c])
++AC_CONFIG_MACRO_DIR([m4])
++AM_INIT_AUTOMAKE([foreign])
++LT_INIT
++
++AC_SUBST([HAVE_UNISTD_H], [0])
++AC_CHECK_HEADER([unistd.h], [HAVE_UNISTD_H=1], [])
++AC_CONFIG_FILES([Makefile minizip.pc])
++AC_OUTPUT
+diff -up zlib-1.2.4/contrib/minizip/Makefile.am.atools zlib-1.2.4/contrib/minizip/Makefile.am
+--- zlib-1.2.4/contrib/minizip/Makefile.am.atools 2010-03-29 10:28:50.000000000 +0200
++++ zlib-1.2.4/contrib/minizip/Makefile.am 2010-03-29 10:32:11.000000000 +0200
+@@ -0,0 +1,31 @@
++ACLOCAL_AMFLAGS = -I m4 --install
++
++lib_LTLIBRARIES = libminizip.la
++
++libminizip_la_SOURCES = \
++ ioapi.c \
++ mztools.c \
++ unzip.c \
++ zip.c
++
++# do not build the static version of libminizip
++libminizip_la_CFLAGS = -shared -I ../.. -L../..
++libminizip_la_LDFLAGS = -version-info 1:0:0 -lz
++
++minizip_includedir = $(includedir)/minizip
++minizip_include_HEADERS = \
++ crypt.h \
++ ioapi.h \
++ mztools.h \
++ unzip.h \
++ zip.h
++
++pkgconfigdir = $(libdir)/pkgconfig
++pkgconfig_DATA = minizip.pc
++
++EXTRA_PROGRAMS = miniunzip minizip
++
++miniunzip_SOURCES = miniunz.c
++miniunzip_LDADD = libminizip.la
++
++minizip_SOURCES = minizip.c
++minizip_LDADD = libminizip.la
+diff -up zlib-1.2.4/contrib/minizip/minizip.pc.in.atools zlib-1.2.4/contrib/minizip/minizip.pc.in
+--- zlib-1.2.4/contrib/minizip/minizip.pc.in.atools 2010-03-29 10:28:50.000000000 +0200
++++ zlib-1.2.4/contrib/minizip/minizip.pc.in 2010-03-29 10:28:50.000000000 +0200
+@@ -0,0 +1,11 @@
++prefix=@prefix@
++exec_prefix=@exec_prefix@
++libdir=@libdir@
++includedir=@includedir@/minizip
++
++Name: minizip
++Description: Minizip zip file manipulation library
++Requires:
++Version: @PACKAGE_VERSION@
++Libs: -L${libdir} -lminizip -lz
++Cflags: -I${includedir}
++++++ zlib-1.2.3.tar.gz -> zlib-1.2.5.tar.gz
48988 lines of diff (skipped)
++++++ deleted files:
--- buildfix.patch
--- minizip-1.2.3-autotools.patch
--- zlib-1.2.3-autotools.patch
--- zlib-1.2.3-minizip.patch
More information about the MeeGo-commits
mailing list