commit clucene-core for openSUSE:Factory
Hello community,
here is the log from the commit of package clucene-core for openSUSE:Factory checked in at 2013-01-29 12:04:30
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/clucene-core (Old)
and /work/SRC/openSUSE:Factory/.clucene-core.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "clucene-core", Maintainer is "kde-maintainers@suse.de"
Changes:
--------
--- /work/SRC/openSUSE:Factory/clucene-core/clucene-core.changes 2012-12-19 10:50:38.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.clucene-core.new/clucene-core.changes 2013-01-29 12:04:59.000000000 +0100
@@ -1,0 +2,8 @@
+Fri Jan 25 01:20:56 UTC 2013 - jengelh@inai.de
+
+- Replace wrong shlib package name "libclucene2" (the SONAME is
+ libclucene*.so.1, not .2) by libclucene-{core,shared}1
+- Use more robust make install command
+- Add patch clucene-kill-ext-includes.diff
+
+-------------------------------------------------------------------
New:
----
clucene-kill-ext-includes.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ clucene-core.spec ++++++
--- /var/tmp/diff_new_pack.qJEl60/_old 2013-01-29 12:05:00.000000000 +0100
+++ /var/tmp/diff_new_pack.qJEl60/_new 2013-01-29 12:05:00.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package clucene-core
#
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -23,13 +23,15 @@
License: LGPL-2.1 or Apache-2.0
Group: Development/Libraries/C and C++
Url: http://clucene.sourceforge.net/
+
+#Git-Clone: git://clucene.git.sourceforge.net/gitroot/clucene/clucene
Source: %{name}-%{version}.tar.bz2
Source2: baselibs.conf
-
# PATCH-FIX-UPSTREAM [rh#748196]
Patch0: clucene-2.3.3.4-pkgconfig.patch
# PATCH-FIX-UPSTREAM [rh#794795]
Patch1: clucene-2.3.3.4-contrib-libs.patch
+Patch2: clucene-kill-ext-includes.diff
BuildRequires: boost-devel
BuildRequires: cmake
@@ -45,18 +47,28 @@
search engine written in C++. CLucene is faster than lucene as it is written
in C++.
-%package -n libclucene2
-Summary: Development files for clucene library
-Group: Development/Libraries/C and C++
-Provides: %{name} = %{version}
-#TODO: Change back to '<' after next version update:
-Obsoletes: %{name} <= %{version}
+%package -n libclucene-core1
+Summary: C++ implementation of the Lucene text search engine
+Group: System/Libraries
+# Rip the wrong name.
+Obsoletes: libclucene2 < %version-%release
+Provides: libclucene2 = %version-%release
-%description -n libclucene2
+%description -n libclucene-core1
CLucene is a C++ port of Lucene. It is a high-performance, full-featured text
search engine written in C++. CLucene is faster than lucene as it is written
in C++.
+%package -n libclucene-shared1
+Summary: CLucene cross-platform layer
+Group: System/Libraries
+
+%description -n libclucene-shared1
+This package creates a library that is used in all the CLucene
+projects. It provides cross-platform macros and functions, as well as
+things like cl_* string macros, file handling functions, replacement
+functions, etc.
+
%package -n libclucene-contribs-lib1
Summary: Language specific text analyzers for %{name}
Group: Development/Libraries/C and C++
@@ -73,7 +85,8 @@
Summary: Development files for clucene library
Group: Development/Libraries/C and C++
Requires: libclucene-contribs-lib1 = %{version}
-Requires: libclucene2 = %{version}
+Requires: libclucene-core1 = %version
+Requires: libclucene-shared1 = %version
Requires: libstdc++-devel
%description devel
@@ -87,6 +100,7 @@
%setup -q
%patch0 -p1
%patch1 -p1
+%patch -P 2 -p1
# the tar ball is stripped like this:
rm -rf test/data/reuters* tests/data/utf* # test/data is not allowed to be distributed bnc#253602
@@ -105,19 +119,27 @@
make %{?_smp_mflags} VERBOSE=1
%install
-%makeinstall
+make install DESTDIR="%buildroot"
rm -f %{buildroot}%{_libdir}/*.la
rm -rf %{buildroot}%{_libdir}/CLuceneConfig.cmake
-%post -n libclucene2 -p /sbin/ldconfig
-%postun -n libclucene2 -p /sbin/ldconfig
+%post -n libclucene-core1 -p /sbin/ldconfig
+%postun -n libclucene-core1 -p /sbin/ldconfig
+%post -n libclucene-shared1 -p /sbin/ldconfig
+%postun -n libclucene-shared1 -p /sbin/ldconfig
-%files -n libclucene2
+%files -n libclucene-core1
%defattr(-,root,root,-)
%doc APACHE.license AUTHORS ChangeLog COPYING doc/ LGPL.license NEWS README README.PACKAGE REQUESTS
-%{_libdir}/libclucene-core.so.*
-%{_libdir}/libclucene-shared.so.*
+%{_libdir}/libclucene-core.so.1
+%{_libdir}/libclucene-core.so.%version
+
+%files -n libclucene-shared1
+%defattr(-,root,root)
+%doc APACHE.license COPYING LGPL.license
+%{_libdir}/libclucene-shared.so.1
+%{_libdir}/libclucene-shared.so.%version
%post -n libclucene-contribs-lib1 -p /sbin/ldconfig
%postun -n libclucene-contribs-lib1 -p /sbin/ldconfig
++++++ baselibs.conf ++++++
--- /var/tmp/diff_new_pack.qJEl60/_old 2013-01-29 12:05:00.000000000 +0100
+++ /var/tmp/diff_new_pack.qJEl60/_new 2013-01-29 12:05:00.000000000 +0100
@@ -1 +1,4 @@
-libclucene2
+libclucene-core1
+ provides "libclucene2 = <version>"
+ obsoletes "libclucene2 < <version>"
+libclucene-shared1
++++++ clucene-kill-ext-includes.diff ++++++
From: Jan Engelhardt
participants (1)
-
root@hilbert.suse.de