[packages/exiv2] - updated to 0.27.0a (new soname, build system switched to cmake) - removed outdated mkinstalldirs,p

qboosh qboosh at pld-linux.org
Sat Jan 5 19:58:36 CET 2019 

commit fc5e6f22e8e60dd4cbaf1b51bdd878c58f484844
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat Jan 5 20:03:28 2019 +0100

    - updated to 0.27.0a (new soname, build system switched to cmake)
    - removed outdated mkinstalldirs,png_support patches

 exiv2-mkinstalldirs.patch | 11 ------
 exiv2-png_support.patch   | 93 ----------------------------------------------
 exiv2.spec                | 94 +++++++++++++++++++++++++----------------------
 3 files changed, 51 insertions(+), 147 deletions(-)
---
diff --git a/exiv2.spec b/exiv2.spec
index dae1020..ba16a54 100644
--- a/exiv2.spec
+++ b/exiv2.spec
@@ -1,29 +1,26 @@
 #
 # Conditional build:
-%bcond_with	curl	# enable webready with HTTP support via curl
-%bcond_with	libssh	# enable webready with SSH support via libssh
+%bcond_with	curl		# enable webready with HTTP support via curl
+%bcond_with	libssh		# enable webready with SSH support via libssh
+%bcond_without	static_libs	# static library
 
 Summary:	EXIF and IPTC metadata manipulation tools
 Summary(pl.UTF-8):	Narzędzia do obróbki metadanych EXIF i IPTC
 Name:		exiv2
-Version:	0.26
+Version:	0.27.0a
 Release:	1
 License:	GPL v2+
 Group:		Applications/Graphics
 #Source0Download: http://www.exiv2.org/download.html
-Source0:	http://www.exiv2.org/builds/%{name}-%{version}-trunk.tar.gz
-# Source0-md5:	5399e3b570d7f9205f0e76d47582da4c
-Patch0:		%{name}-mkinstalldirs.patch
-Patch1:		%{name}-png_support.patch
+Source0:	http://www.exiv2.org/builds/%{name}-%{version}-Source.tar.gz
+# Source0-md5:	b7f49949deafa96a9e6a22d42bd91031
 URL:		http://www.exiv2.org/
-BuildRequires:	autoconf >= 2.61
-BuildRequires:	automake
+BuildRequires:	cmake >= 3.3.2
 %{?with_curl:BuildRequires:	curl-devel}
 BuildRequires:	expat-devel
 BuildRequires:	gettext-tools
 %{?with_libssh:BuildRequires:	libssh-devel}
 BuildRequires:	libstdc++-devel
-BuildRequires:	libtool >= 2:2.0
 BuildRequires:	zlib-devel
 Requires:	%{name}-libs = %{version}-%{release}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -75,47 +72,54 @@ EXIF and IPTC metadata manipulation static library.
 Statyczna biblioteka do obróbki metadanych EXIF i IPTC.
 
 %prep
-%setup -q -n %{name}-trunk
-%patch0 -p0
-%patch1 -p1
+%setup -q -n %{name}-0.27.0-Source
 
-ln -s config/configure.ac .
+%build
+%if %{with static_libs}
+install -d build-static
+cd build-static
+%cmake .. \
+	-DBUILD_SHARED_LIBS=OFF \
+	-DEXIV2_BUILD_PO=ON \
+	-DEXIV2_BUILD_SAMPLES=OFF \
+	%{?with_curl:-DEXIV2_ENABLE_CURL=ON} \
+	%{?with_libssh:-DEXIV2_ENABLE_SSH=ON} \
+	-DEXIV2_ENABLE_VIDEO=ON \
+%if %{with curl} || %{with libssh}
+	-DEXIV2_ENABLE_WEBREADY=ON
+%endif
 
-# AX_CXX_CHECK_FLAG from old autoconf-archive, missing in acinclude or separate file
-tail -n +10113 config/aclocal.m4 >> acinclude.m4
+%{__make}
+cd ..
+%endif
 
-%build
-%{__libtoolize} --install
-%{__aclocal}
-%{__autoconf}
-# don't touch autoheader, config.h.in has been manually modified
-%configure \
-	--enable-video \
+install -d build
+cd build
+%cmake .. \
+	-DEXIV2_BUILD_PO=ON \
+	-DEXIV2_BUILD_SAMPLES=OFF \
+	%{?with_curl:-DEXIV2_ENABLE_CURL=ON} \
+	%{?with_libssh:-DEXIV2_ENABLE_SSH=ON} \
+	-DEXIV2_ENABLE_VIDEO=ON \
 %if %{with curl} || %{with libssh}
-	--enable-webready \
-	%{!?with_curl:--without-curl} \
-	%{!?with_libssh:--without-ssh}
+	-DEXIV2_ENABLE_WEBREADY=ON
 %endif
 
-%{__make} \
-	CFLAGS="%{rpmcflags} -Wall" \
-	CXXFLAGS="%{rpmcxxflags} -Wall"
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} install \
-	incdir=%{_includedir}/exiv2 \
-	libdir=%{_libdir} \
-	bindir=%{_bindir} \
+%if %{with static_libs}
+%{__make} -C build-static install \
+	DESTDIR=$RPM_BUILD_ROOT
+%endif
+
+%{__make} -C build install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-# obsoleted by pkg-config
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/libexiv2.la
-# let rpm autodetect dependencies
-chmod 755 $RPM_BUILD_ROOT%{_libdir}/libexiv2.so*
-# samples (exifprint, exiv2json) are not installed, so don't package man
-%{__rm} $RPM_BUILD_ROOT%{_mandir}/man1/exiv2samples.1
+# internally used Adobe XMP SDK
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libxmp.a
 
 %find_lang %{name}
 
@@ -127,21 +131,25 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc doc/ChangeLog README
-%attr(755,root,root) %{_bindir}/%{name}
+%doc README.md doc/ChangeLog doc/cmd.txt
+%attr(755,root,root) %{_bindir}/exiv2
 %{_mandir}/man1/exiv2.1*
 
 %files libs
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libexiv2.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libexiv2.so.26
+%attr(755,root,root) %ghost %{_libdir}/libexiv2.so.27
 
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libexiv2.so
-%{_includedir}/%{name}
+%{_includedir}/exiv2
 %{_pkgconfigdir}/exiv2.pc
+%dir %{_datadir}/exiv2
+%{_datadir}/exiv2/cmake
 
+%if %{with static_libs}
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/libexiv2.a
+%endif
diff --git a/exiv2-mkinstalldirs.patch b/exiv2-mkinstalldirs.patch
deleted file mode 100644
index 8b2a244..0000000
--- a/exiv2-mkinstalldirs.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- po/Makefile.in.in	2006-12-09 13:10:21.000000000 +0100
-+++ po/Makefile.in.in-new	2007-06-21 17:55:34.307489594 +0200
-@@ -30,7 +30,7 @@
- 
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
--MKINSTALLDIRS = @MKINSTALLDIRS@
-+MKINSTALLDIRS = /usr/share/automake/mkinstalldirs
- mkinstalldirs = $(SHELL) $(MKINSTALLDIRS)
- 
- GMSGFMT = @GMSGFMT@
diff --git a/exiv2-png_support.patch b/exiv2-png_support.patch
deleted file mode 100644
index 135976c..0000000
--- a/exiv2-png_support.patch
+++ /dev/null
@@ -1,93 +0,0 @@
---- exiv2-0.17.1/acinclude.m4.orig	1970-01-01 01:00:00.000000000 +0100
-+++ exiv2-0.17.1/acinclude.m4	2008-07-21 13:52:55.923794430 +0200
-@@ -0,0 +1,90 @@
-+dnl @synopsis CHECK_ZLIB()
-+dnl
-+dnl This macro searches for an installed zlib library. If nothing
-+dnl was specified when calling configure, it searches first in /usr/local
-+dnl and then in /usr. If the --with-zlib=DIR is specified, it will try
-+dnl to find it in DIR/include/zlib.h and DIR/lib/libz.a. If --without-zlib
-+dnl is specified, the library is not searched at all.
-+dnl
-+dnl If either the header file (zlib.h) or the library (libz) is not
-+dnl found, the configuration exits on error, asking for a valid
-+dnl zlib installation directory or --without-zlib.
-+dnl
-+dnl The macro defines the symbol HAVE_LIBZ if the library is found. You should
-+dnl use autoheader to include a definition for this symbol in a config.h
-+dnl file. Sample usage in a C/C++ source is as follows:
-+dnl
-+dnl   #ifdef HAVE_LIBZ
-+dnl   #include <zlib.h>
-+dnl   #endif /* HAVE_LIBZ */
-+dnl
-+dnl @version $Id$
-+dnl @author Loic Dachary <loic at senga.org>
-+dnl with modifications by Andreas Huggel <ahuggel at gmx.net>
-+dnl
-+AC_DEFUN([CHECK_ZLIB],
-+#
-+# Handle user hints
-+#
-+[AC_MSG_CHECKING(if zlib is wanted)
-+AC_ARG_WITH(zlib,
-+[  --with-zlib=DIR root directory path of zlib installation [defaults to
-+		    /usr/local or /usr if not found in /usr/local]
-+  --without-zlib to disable zlib usage completely],
-+[if test "$withval" != no ; then
-+  AC_MSG_RESULT(yes)
-+  ZLIB_HOME="$withval"
-+else
-+  AC_MSG_RESULT(no)
-+fi], [
-+AC_MSG_RESULT(yes)
-+ZLIB_HOME=/usr/local
-+if test ! -f "${ZLIB_HOME}/include/zlib.h"
-+then
-+	ZLIB_HOME=/usr
-+fi
-+])
-+#
-+# Locate zlib, if wanted
-+#
-+if test -n "${ZLIB_HOME}"
-+then
-+	ZLIB_OLD_LDFLAGS=$LDFLAGS
-+	ZLIB_OLD_CPPFLAGS=$CPPFLAGS
-+	#
-+	# Adding /usr/lib or /usr/include to the flags/libs may
-+	# hurt if using a compiler not installed in the standard 
-+	# place.
-+	#
-+        if test "${ZLIB_HOME}" != "/usr"
-+	then
-+		LDFLAGS="$LDFLAGS -L${ZLIB_HOME}/lib"
-+		CPPFLAGS="$CPPFLAGS -I${ZLIB_HOME}/include"
-+	fi
-+        AC_LANG_SAVE
-+        AC_LANG_C
-+	AC_CHECK_LIB(z, inflateEnd, [zlib_cv_libz=yes], [zlib_cv_libz=no])
-+        AC_CHECK_HEADER(zlib.h, [zlib_cv_zlib_h=yes], [zlib_cv_zlib_h=no])
-+        AC_LANG_RESTORE
-+	if test "$zlib_cv_libz" = "yes" -a "$zlib_cv_zlib_h" = "yes"
-+	then
-+		#
-+		# If both library and header were found, use them
-+		#
-+		AC_CHECK_LIB(z, inflateEnd)
-+		AC_MSG_CHECKING(zlib in ${ZLIB_HOME})
-+		AC_MSG_RESULT(ok)
-+		HAVE_LIBZ=1
-+	else
-+		#
-+		# If either header or library was not found, revert and bomb
-+		#
-+		AC_MSG_CHECKING(zlib in ${ZLIB_HOME})
-+		LDFLAGS="$ZLIB_OLD_LDFLAGS"
-+		CPPFLAGS="$ZLIB_OLD_CPPFLAGS"
-+		AC_MSG_RESULT(failed)
-+		AC_MSG_ERROR(either specify a valid zlib installation with --with-zlib=DIR or disable zlib usage with --without-zlib)
-+	fi
-+fi
-+
-+])
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/exiv2.git/commitdiff/fc5e6f22e8e60dd4cbaf1b51bdd878c58f484844

More information about the pld-cvs-commit mailing list