File project.diff of Package clucene-core

Overview Repositories Revisions Requests Users Attributes Meta

File project.diff of Package clucene-core (Revision 343589ee43306ae7ec2e4c0629939563)

Currently displaying revision 343589ee43306ae7ec2e4c0629939563 , Show latest

--- baselibs.conf.orig
+++ baselibs.conf
@@ -1 +1 @@
-clucene-core
+libclucene2
--- clucene-core.changes.orig
+++ clucene-core.changes
@@ -1,4 +1,55 @@
 -------------------------------------------------------------------
+Fri Nov 25 09:42:10 UTC 2011 - dev@dominik-schmidt.de
+
+- Fixed typo in cmake arguments 
+
+-------------------------------------------------------------------
+Thu Nov 24 09:29:56 UTC 2011 - saschpe@suse.de
+
+- Darix doesn't want a renamed devel package, thus revert that part
+
+-------------------------------------------------------------------
+Wed Nov 23 12:45:56 UTC 2011 - tittiatcoke@gmail.com
+
+- Removed the link as source. It seems very hard to determine the
+  exactly link with sourceforge. 
+
+-------------------------------------------------------------------
+Wed Nov 23 03:29:48 UTC 2011 - dev@dominik-schmidt.de
+
+- put clucene-config.h in %_libdir/CLucene/ as it's not multilib 
+  ready and fixfix libclucene-core.pc to know about it [rh#748196]
+- put CLuceneConfig.cmake there as well as it only includes version
+  information but no include path or link targets
+- don't use bundled boost
+
+-------------------------------------------------------------------
+Tue Nov 15 15:45:48 UTC 2011 - saschpe@suse.de
+
+- Honor shared library policy:
+  * Obsolete devel package, introduce libclucene0 + libclucene-devel
+- Simplified cmake usage, no need for that many env vars
+
+-------------------------------------------------------------------
+Fri Nov 11 13:48:25 UTC 2011 - dev@dominik-schmidt.de
+
+- Update to 2.3.3.4:
+  * Static object fields have been changed to method accessors
+    Classes changed: FieldCache, ScoreDocComparator.
+    This was necessary for creating static libraries work on certain
+    platforms.
+  * Folders were reorganised, this seems like a good time to do it
+  * Some deprecated functions were removed.
+  * moved platform configuration type code and utility code into
+    'shared' project. This enables tests to be built with a shared
+    library on windows
+  * Moved moved of the platform specific logic into cmake in order
+    to reduce #ifdefs in code
+  * added contributions code into the trunk. this will hopefully mean
+    more exposure to the contributions.
+  * Deletor::Array was renamed to Deletor::vArray.
+
+-------------------------------------------------------------------
 Fri Sep 30 20:07:49 UTC 2011 - coolo@suse.com
 
 - add libtool as buildrequire to make the spec file more reliable
@@ -6,7 +57,7 @@ Fri Sep 30 20:07:49 UTC 2011 - coolo@sus
 -------------------------------------------------------------------
 Wed Sep 14 15:09:49 UTC 2011 - idonmez@suse.com
 
-- Fix license string to be LGPL-2.1 or Apache-2.0 , bnc#717711 
+- Fix license string to be LGPL-2.1 or Apache-2.0 , bnc#717711
 
 -------------------------------------------------------------------
 Tue Sep 13 11:38:36 UTC 2011 - idonmez@suse.com
@@ -27,7 +78,7 @@ Mon May 18 12:21:21 CEST 2009 - dmueller
 -------------------------------------------------------------------
 Wed Jan 28 16:16:08 CET 2009 - crrodriguez@suse.de
 
-- remove "la" files 
+- remove "la" files
 
 -------------------------------------------------------------------
 Sun Sep 21 08:20:59 CEST 2008 - stbinner@suse.de
@@ -43,7 +94,7 @@ Thu Apr 10 12:54:45 CEST 2008 - ro@suse.
 -------------------------------------------------------------------
 Tue Oct  9 00:46:52 CEST 2007 - dmueller@suse.de
 
-- update to 0.9.20: 
+- update to 0.9.20:
   * no changelog available
 
 -------------------------------------------------------------------
--- clucene-core.spec.orig
+++ clucene-core.spec
@@ -18,75 +18,100 @@
 
 
 Name:           clucene-core
-Version:        0.9.21
-Release:        77
+Version:        2.3.3.4
+Release:        0
 License:        LGPL-2.1 or Apache-2.0
 Summary:        CLucene is a C++ port of Lucene
 Url:            http://clucene.sourceforge.net/
 Group:          Development/Libraries/C and C++
-Source:         http://prdownloads.sourceforge.net/clucene/%{name}-%{version}.tar.bz2
+Source:         %{name}-%{version}.tar.bz2
 Source2:        baselibs.conf
-Patch0:         gcc-4.4.diff
+
+# PATCH-FIX-UPSTREAM [rh#748196]
+Patch0:         clucene-core-2.3.3.4-pkgconfig_sys_includes.patch
+
+BuildRequires:  cmake
 BuildRequires:  doxygen
 BuildRequires:  gcc-c++
 BuildRequires:  libtool
+BuildRequires:  pkg-config
+BuildRequires:  zlib-devel
+BuildRequires:  boost-devel
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
-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++.
+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 devel
+%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}
+
+%description -n libclucene2
+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 devel
 Summary:        Development files for clucene library
 Group:          Development/Libraries/C and C++
-Requires:       %{name} = %{version}
+Requires:       libclucene2 = %{version}
 Requires:       libstdc++-devel
 
 %description devel
-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++.
+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++.
+
+This package holds the development files for clucene.
 
 %prep
 %setup -q
-%patch0
+%patch0 -p1
 
-# test/data is not allowed to be distributed bnc#253602
-rm -rf test/data/reuters* tests/data/utf*
+# 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
 
 %build
-./autogen.sh
-%configure --with-pic --disable-static
-make %{?_smp_mflags}
+cmake . \
+    -DCMAKE_CXX_FLAGS="%{optflags}" \
+    -DCMAKE_C_FLAGS="%{optflags}" \
+    -DCMAKE_INSTALL_PREFIX="%{_prefix}" \
+    -DLUCENE_SYS_INCLUDES:PATH=%{_libdir} \
+    -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+%ifarch x86_64
+    -DLIB_SUFFIX=64
+%endif
 
-%check
-make check || true
+make %{?_smp_mflags} VERBOSE=1
 
 %install
 %make_install
 rm -f %{buildroot}%{_libdir}/*.la
+rm -rf %{buildroot}%{_libdir}/CLuceneConfig.cmake
 
-%clean
-rm -rf %{buildroot}
-
-%post -p /sbin/ldconfig
+%post -n libclucene2 -p /sbin/ldconfig
 
-%postun -p /sbin/ldconfig
+%postun -n libclucene2 -p /sbin/ldconfig
 
-%files
+%files -n libclucene2
 %defattr(-,root,root,-)
-%{_libdir}/libclucene.so.*
-%doc doc/*htm doc/*.jpg
-%doc README* APACHE.license AUTHORS COPYING HACKING README REQUESTS
+%doc APACHE.license AUTHORS ChangeLog COPYING doc/ LGPL.license  NEWS  README README.PACKAGE REQUESTS
+%{_libdir}/libclucene*.so.*
 
 %files devel
 %defattr(-,root,root,-)
-%{_includedir}/CLucene.h
-%{_includedir}/CLucene/
+%{_libdir}/libclucene*.so
+
+%{_includedir}/CLucene*
 %dir %{_libdir}/CLucene/
 %{_libdir}/CLucene/clucene-config.h
-%{_libdir}/libclucene.so
+
+%{_libdir}/CLucene/CLuceneConfig.cmake
+%{_libdir}/pkgconfig/libclucene-core.pc
 
 %changelog

Places

File project.diff of Package clucene-core (Revision 343589ee43306ae7ec2e4c0629939563)

Places