- added 7z-lib patch; package 7z library (named libadv7z, -7z-* subpackages)

- release 2

diff --git a/advancecomp-7z-lib.patch b/advancecomp-7z-lib.patch
new file mode 100644 (file)
index 0000000..5ab7aab
--- /dev/null
+++ b/advancecomp-7z-lib.patch
@@ -0,0 +1,69 @@
+--- advancecomp-1.23/Makefile.am.orig  2016-12-19 05:33:51.310793262 +0100
++++ advancecomp-1.23/Makefile.am       2017-05-09 18:58:20.486037160 +0200
+@@ -1,6 +1,10 @@
+ bin_PROGRAMS = advzip advpng advmng advdef
+ 
+-7z_SOURCES = \
++lib_LTLIBRARIES = libadv7z.la
++adv7zincludedir = $(includedir)/adv7z
++adv7zinclude_HEADERS = 7z/7z.h
++
++libadv7z_la_SOURCES = \
+       7z/7zdeflate.cc \
+       7z/7zlzma.cc \
+       7z/AriBitCoder.cc \
+@@ -23,7 +27,7 @@
+ 
+ libdeflate_LIBS = -ldeflate
+ zopfli_LIBS = -lzopfli
+-LDADD = $(libdeflate_LIBS) $(zopfli_LIBS)
++LDADD = $(libdeflate_LIBS) $(zopfli_LIBS) libadv7z.la
+ 
+ advzip_SOURCES = \
+       rezip.cc \
+@@ -35,7 +39,7 @@
+       zipsh.cc \
+       getopt.c \
+       snprintf.c \
+-      $(7z_SOURCES)
++      $(nil)
+ 
+ advpng_SOURCES = \
+       repng.cc \
+@@ -50,7 +54,7 @@
+       lib/png.c \
+       lib/error.c \
+       lib/snstring.c \
+-      $(7z_SOURCES)
++      $(nil)
+ 
+ advmng_SOURCES = \
+       remng.cc \
+@@ -68,7 +72,7 @@
+       lib/mng.c \
+       lib/error.c \
+       lib/snstring.c \
+-      $(7z_SOURCES)
++      $(nil)
+ 
+ advdef_SOURCES = \
+       redef.cc \
+@@ -84,7 +88,7 @@
+       lib/snstring.c \
+       lib/png.c \
+       lib/mng.c \
+-      $(7z_SOURCES)
++      $(nil)
+ 
+ EXTRA_DIST = \
+       README AUTHORS HISTORY INSTALL COPYING \
+--- advancecomp-1.23/configure.ac.orig 2016-11-21 18:26:40.000000000 +0100
++++ advancecomp-1.23/configure.ac      2017-05-09 19:02:08.302701223 +0200
+@@ -2,6 +2,7 @@
+ AC_PREREQ([2.65])
+ AC_INIT([AdvanceCOMP], [1.23], [], [], [http://www.advancemame.it])
+ AM_INIT_AUTOMAKE([foreign no-dependencies subdir-objects])
++LT_INIT
+ AC_CONFIG_SRCDIR([rezip.cc])
+ AC_CONFIG_HEADERS([config.h])
+ AC_CANONICAL_HOST

diff --git a/advancecomp.spec b/advancecomp.spec
index 05f435998827d92cfcb0b49ef23770f5c32f7f16..648aebb34fd87addd58b205f39ded8854d4ce95d 100644 (file)
--- a/advancecomp.spec
+++ b/advancecomp.spec
@@ -6,18 +6,20 @@ Summary:      Recompression utilities for .ZIP archives, .PNG snapshots, .MNG video c
 Summary(pl.UTF-8):     Narzędzia rekompresujące pliki ZIP, PNG, MNG, gz
 Name:          advancecomp
 Version:       1.23
-Release:       1
+Release:       2
 License:       GPL v3+
 Group:         Applications/File
 Source0:       http://downloads.sourceforge.net/advancemame/%{name}-%{version}.tar.gz
 # Source0-md5: 39a205f0ba1baa26550fccc6405a6b45
 Patch0:                %{name}-system-libs.patch
+Patch1:                %{name}-7z-lib.patch
 URL:           http://advancemame.sourceforge.net/comp-readme.html
 BuildRequires: autoconf >= 2.65
 BuildRequires: automake
 %{?with_bzip2:BuildRequires:   bzip2-devel}
 BuildRequires: libdeflate-devel
 BuildRequires: libstdc++-devel
+BuildRequires: libtool >= 2:2
 BuildRequires: zlib-devel
 BuildRequires: zopfli-devel
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -46,11 +48,49 @@ Głównymi cechami są:
   kompresji deflate z 7-Zipa.
 - Rekompresja plików MNG z użyciem optymalizacji delta i move.
 
+%package 7z
+Summary:       7z library from AdvanceCOMP project
+Summary(pl.UTF-8):     Biblioteka 7z z projektu AdvanceCOMP
+Group:         Libraries
+
+%description 7z
+7z library from AdvanceCOMP project.
+
+%description 7z -l pl.UTF-8
+Biblioteka 7z z projektu AdvanceCOMP.
+
+%package 7z-devel
+Summary:       Header file for AdvanceCOMP 7z library
+Summary(pl.UTF-8):     Plik nagłówkowy biblioteki AdvanceCOMP 7z
+Group:         Development/Libraries
+Requires:      %{name}-7z = %{version}-%{release}
+Requires:      libstdc++-devel
+
+%description 7z-devel
+Header file for AdvanceCOMP 7z library.
+
+%description 7z-devel -l pl.UTF-8
+Plik nagłówkowy biblioteki AdvanceCOMP 7z.
+
+%package 7z-static
+Summary:       Static AdvanceCOMP 7z library
+Summary(pl.UTF-8):     Statyczna biblioteka AdvanceCOMP 7z
+Group:         Development/Libraries
+Requires:      %{name}-7z-devel = %{version}-%{release}
+
+%description 7z-static
+Static AdvanceCOMP 7z library.
+
+%description 7z-static -l pl.UTF-8
+Statyczna biblioteka AdvanceCOMP 7z.
+
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
+%{__libtoolize}
 %{__aclocal}
 %{__autoconf}
 %{__autoheader}
@@ -65,9 +105,15 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
+# no external dependencies
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libadv7z.la
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post  7z -p /sbin/ldconfig
+%postun        7z -p /sbin/ldconfig
+
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS HISTORY README
@@ -79,3 +125,17 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/advmng.1*
 %{_mandir}/man1/advpng.1*
 %{_mandir}/man1/advzip.1*
+
+%files 7z
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libadv7z.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libadv7z.so.0
+
+%files 7z-devel
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libadv7z.so
+%{_includedir}/adv7z
+
+%files 7z-static
+%defattr(644,root,root,755)
+%{_libdir}/libadv7z.a