Author: qboosh                       Date: Sun May 27 12:51:26 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 1.6.1
- build using latest p7zip sources
- added link patch
- added -devel, -static
- License tag filled from project page

---- Files affected:
packages/lib7zip:
   lib7zip.spec (1.2 -> 1.3) , lib7zip-link.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/lib7zip/lib7zip.spec
diff -u packages/lib7zip/lib7zip.spec:1.2 packages/lib7zip/lib7zip.spec:1.3
--- packages/lib7zip/lib7zip.spec:1.2   Sun May 27 14:03:28 2012
+++ packages/lib7zip/lib7zip.spec       Sun May 27 14:51:21 2012
@@ -1,14 +1,24 @@
 # $Revision$, $Date$
+%define                p7zip_version   9.20.1
 Summary:       A library using 7z.dll/7z.so (from 7-Zip) to handle different 
archive types
 Summary(pl.UTF-8):     Biblioteka wykorzystująca 7z.dll/7z.so (z 7-zipa) do 
obsługi różnych rodzajów archiwów
 Name:          lib7zip
-Version:       1.4.1
-Release:       0.1
-License:       - (enter GPL/GPL v2/GPL v3/LGPL/BSD/BSD-like/other license name 
here)
-Group:         Applications
+Version:       1.6.1
+Release:       1
+License:       MPL v1.1
+Group:         Libraries
+#Source0Download: http://code.google.com/p/lib7zip/downloads/list
 Source0:       http://lib7zip.googlecode.com/files/%{name}-%{version}.tar.gz
-# Source0-md5: 79ef69fc5c8ddce040387377b6dbbdcc
+# Source0-md5: c752a2d51774178ac6e9682a9db61d2d
+Source1:       
http://downloads.sourceforge.net/p7zip/p7zip_%{p7zip_version}_src_all.tar.bz2
+# Source1-md5: bd6caaea567dc0d995c990c5cc883c89
+Patch0:                %{name}-link.patch
 URL:           http://code.google.com/p/lib7zip/
+BuildRequires: autoconf >= 2.50
+BuildRequires: automake
+BuildRequires: libstdc++-devel
+BuildRequires: libtool >= 2:2.0
+BuildRequires: sed >= 4.0
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -19,11 +29,45 @@
 Biblioteka wykorzystująca 7z.dll/7z.so (z 7-zipa) do obsługi różnych
 rodzajów archiwów.
 
+%package devel
+Summary:       Development files for lib7zip library
+Summary(pl.UTF-8):     Pliki programistyczne biblioteki lib7zip
+Group:         Development/Libraries
+Requires:      %{name} = %{version}-%{release}
+Requires:      libstdc++-devel
+
+%description devel
+Development files for lib7zip library.
+
+%description devel -l pl.UTF-8
+Pliki programistyczne biblioteki lib7zip.
+
+%package static
+Summary:       Static lib7zip library
+Summary(pl.UTF-8):     Statyczna biblioteka lib7zip
+Group:         Development/Libraries
+Requires:      %{name}-devel = %{version}-%{release}
+
+%description static
+Static lib7zip library.
+
+%description static -l pl.UTF-8
+Statyczna biblioteka lib7zip.
+
 %prep
-%setup -q
+%setup -q -a1
+%patch0 -p1
+
+# remove it when "linking libtool libraries using a non-POSIX archiver ..." 
warning is gone
+# (after lib7zip or libtool change)
+%{__sed} -i -e '/AM_INIT_AUTOMAKE/s/-Werror//' configure.ac
 
 %build
-export P7ZIP_SOURCE_DIR="$(pwd)"
+%{__libtoolize}
+%{__aclocal}
+%{__autoconf}
+%{__automake}
+export P7ZIP_SOURCE_DIR="$(pwd)/p7zip_%{p7zip_version}"
 %configure
 %{__make}
 
@@ -33,13 +77,28 @@
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
+# test programs
+%{__rm} $RPM_BUILD_ROOT%{_bindir}/test7z*
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post  -p /sbin/ldconfig
+%postun        -p /sbin/ldconfig
+
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS CREDITS ChangeLog NEWS README THANKS TODO
-%attr(755,root,root) %{_bindir}/*
+%attr(755,root,root) %{_libdir}/lib7zip.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/lib7zip.so.0
+
+%files devel
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/lib7zip.so
+%{_libdir}/lib7zip.la
+
+%files static
+%defattr(644,root,root,755)
+%{_libdir}/lib7zip.a
 
 %define date   %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -47,6 +106,13 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.3  2012/05/27 12:51:21  qboosh
+- updated to 1.6.1
+- build using latest p7zip sources
+- added link patch
+- added -devel, -static
+- License tag filled from project page
+
 Revision 1.2  2012/05/27 12:03:28  qboosh
 - pl
 

================================================================
Index: packages/lib7zip/lib7zip-link.patch
diff -u /dev/null packages/lib7zip/lib7zip-link.patch:1.1
--- /dev/null   Sun May 27 14:51:26 2012
+++ packages/lib7zip/lib7zip-link.patch Sun May 27 14:51:21 2012
@@ -0,0 +1,10 @@
+--- lib7zip-1.6.1/Lib7Zip/Makefile.am.orig     2012-05-10 17:07:04.000000000 
+0200
++++ lib7zip-1.6.1/Lib7Zip/Makefile.am  2012-05-27 14:38:59.512758112 +0200
+@@ -49,6 +49,7 @@
+ #LIB7ZIP_VERSION_INFO=1.6.0
+ # -version-info @LIB7ZIP_VERSION_INFO@
+ lib7zip_la_LDFLAGS =  -no-undefined
++lib7zip_la_LIBADD = -ldl
+ 
+ 
+ EXTRA_DIST = Lib7Zip.vcproj 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/lib7zip/lib7zip.spec?r1=1.2&r2=1.3

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to