Hello community, here is the log from the commit of package sword for openSUSE:Factory checked in at 2018-01-07 17:23:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sword (Old) and /work/SRC/openSUSE:Factory/.sword.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sword" Sun Jan 7 17:23:41 2018 rev:14 rq:562201 version:1.7.5~a1 Changes: -------- --- /work/SRC/openSUSE:Factory/sword/sword.changes 2016-07-14 09:50:41.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.sword.new/sword.changes 2018-01-07 17:23:51.670278376 +0100 @@ -1,0 +2,10 @@ +Mon Dec 18 09:43:47 UTC 2017 - mplus...@suse.com + +- Use pkgconfig style dependencies and drop distro specific + conditions +- Let rpm generate dependencies/requirements and do not inject them + manually +- Cleanup with spec-cleaner +- Do not strip created libraries + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sword.spec ++++++ --- /var/tmp/diff_new_pack.3k0K0y/_old 2018-01-07 17:23:52.210253066 +0100 +++ /var/tmp/diff_new_pack.3k0K0y/_new 2018-01-07 17:23:52.214252878 +0100 @@ -1,7 +1,7 @@ # # spec file for package sword # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,53 +24,26 @@ Summary: Framework for manipulating Bible texts License: GPL-2.0 Group: Development/Libraries/C and C++ -Url: http://www.crosswire.org/sword +URL: http://www.crosswire.org/sword Source0: %{name}-1.7.5a1.tar.gz Source1: %{name}-rpmlintrc Patch1: sword-1.7.1-curl.patch Patch2: sword_sysdata_changes.patch # PATCH-FIX-UPSTREAM marguer...@opensuse.org - increase -ftemplate-depth to 100 Patch3: sword-gcc6-ftemplate-depth.patch -BuildRequires: curl-devel +BuildRequires: autoconf +BuildRequires: automake BuildRequires: gcc-c++ -BuildRequires: icu -BuildRequires: libicu-devel BuildRequires: libtool BuildRequires: pkgconfig -BuildRequires: zlib-devel -Requires: libsword-%{libver} = %{version} -BuildRoot: %{_tmppath}/%{name}-%{version}-build -# -# openSUSE -# -%if 0%{?suse_version} -BuildRequires: clucene-core-devel +BuildRequires: pkgconfig(cppunit) +BuildRequires: pkgconfig(icu-i18n) +BuildRequires: pkgconfig(libclucene-core) +BuildRequires: pkgconfig(libcurl) +BuildRequires: pkgconfig(zlib) Recommends: sword-bible Recommends: sword-commentary Recommends: sword-frontend -%endif -# -# Fedora -# -%if 0%{?fedora_version} -BuildRequires: clucene-core-devel -%endif -# -# Mandriva -# -%if 0%{?mandriva_version} -%ifarch x86_64 -BuildRequires: lib64clucene-devel -%else -BuildRequires: libclucene-devel -%endif -%endif -# -# CentOS -# -%if ( %{defined centos_version} && 0%{?centos_version} < 600 ) -BuildRequires: sqlite -%endif %description The SWORD Project is an effort to create an ever expanding software package for @@ -83,8 +56,6 @@ %package -n libsword-%{libver} Summary: Shared library for sword Group: Development/Libraries/Other -Provides: libsword = %{version} -Provides: libsword%{libver} %description -n libsword-%{libver} This package contains the shared library for applications using sword. @@ -92,12 +63,8 @@ %package devel Summary: Include files and static libraries for developing sword applications Group: Development/Libraries/Other -Requires: sword = %{version} -%if 0%{?centos_version} < 600 -Requires: curl-devel -%else -Requires: libcurl-devel -%endif +Requires: libsword-%{libver} = %{version} +Requires: pkgconfig(libcurl) %description devel Include files and static libraries for developing sword applications. This package @@ -110,9 +77,9 @@ %patch3 -p1 %build -NOCONFIGURE=1 ./autogen.sh - -%configure --disable-static \ +autoreconf -fiv +%configure \ + --disable-static \ --with-icu \ --enable-tests \ --enable-examples @@ -147,16 +114,11 @@ %install %make_install install_config find %{buildroot} -type f -name "*.la" -delete -print -pushd %{buildroot}/%{_bindir} -strip * -strip %{buildroot}/%{_libdir}/libsword*.so -popd %post -n libsword-%{libver} -p /sbin/ldconfig %postun -n libsword-%{libver} -p /sbin/ldconfig %files -%defattr(-,root,root) %doc AUTHORS COPYING ChangeLog LICENSE NEWS README doc/translation-template.conf %config(noreplace) %{_sysconfdir}/sword.conf %{_bindir}/* @@ -167,11 +129,9 @@ %{_datadir}/sword/mods.d/globals.conf %files -n libsword-%{libver} -%defattr(-,root,root) %{_libdir}/libsword-%{libinstver}.so %files devel -%defattr(-,root,root) %doc CODINGSTYLE %{_includedir}/* %{_libdir}/pkgconfig/sword.pc
