- fix specfile

diff --git a/package/libsolv.spec.in b/package/libsolv.spec.in
index 1bdb24f45105da31f6f609dd62290b0b672e5651..1c5132fc3dd66a800d62b2e5b0c55f7310f0cf3d 100644 (file)
--- a/package/libsolv.spec.in
+++ b/package/libsolv.spec.in
@@ -33,18 +33,27 @@ BuildRequires:  expat-devel
 %endif
 BuildRequires:  cmake rpm-devel gcc-c++
 BuildRequires:  zlib-devel
-# the testsuite uses the check framework
-%if 0%{?suse_version} >= 1030 || !0%{?suse_version}
-BuildRequires:  check-devel
-%else
-BuildRequires:  check
-%endif
 Summary:        A new approach to package dependency solving
 
 
 %description
 A new approach to package dependency solving
 
+Authors:
+--------
+    Michael Schroeder <mls@suse.de>
+    Klaus Kaempf <kkaempf@suse.de>
+    Stephan Kulow <coolo@suse.de>
+    Michael Matz <matz@suse.de>
+    Duncan Mac-Vicar P. <dmacvicar@suse.de>
+
+%package -n libsolv@LIBSOLV_SOVERSION@
+Summary:        A new approach to package dependency solving
+Group:          Development/Libraries/C and C++
+
+%description -n libsolv@LIBSOLV_SOVERSION@
+A new approach to package dependency solving
+
 Authors:
 --------
     Michael Schroeder <mls@suse.de>
@@ -62,7 +71,6 @@ Requires:       rpm-devel
 %description devel
 Development files for libsolv, a new approach to package dependency solving
 
-
 Authors:
 --------
     Michael Schroeder <mls@suse.de>
@@ -106,10 +114,6 @@ CMAKE_FLAGS=
 %if 0%{?fedora_version}
 CMAKE_FLAGS="-DFEDORA=1"
 %endif
-# Where does RHEL provide qsort_r ?
-%if 0%{?rhel_version} > 0 || 0%{?centos_version} > 0
-export CFLAGS="$RPM_OPT_FLAGS -DUSE_OWN_QSORT=1"
-%endif
 
 cmake   $CMAKE_FLAGS \
        -DCMAKE_INSTALL_PREFIX=%{_prefix} \
@@ -118,38 +122,32 @@ cmake   $CMAKE_FLAGS \
        -DCMAKE_BUILD_TYPE=Release \
        -DCMAKE_SKIP_RPATH=1 
 make %{?jobs:-j %jobs}
-make doc_forced
-
-%if 0%{?run_testsuite}
-  ln -s . build
-  ctest .
-%endif
 
 %install
 make DESTDIR=$RPM_BUILD_ROOT install
 # we want to leave the .a file untouched
 export NO_BRP_STRIP_DEBUG=true
-#pushd doc/autodoc
-#make install
-#popd
 
 %clean
 rm -rf "$RPM_BUILD_ROOT"
 
-%files tools
+%files -n libsolv@LIBSOLV_SOVERSION@
 %defattr(-,root,root)
 %doc LICENSE*
-%exclude /usr/bin/deptestomatic
+%_libdir/libsolv.so.*
+%_libdir/libsolvext.so.*
+
+%files tools
+%defattr(-,root,root)
 %exclude /usr/bin/helix2solv
 %exclude /usr/bin/solv
 /usr/bin/*
 
 %files devel
 %defattr(-,root,root)
-%_libdir/libsolv.a
-%_libdir/libsolvext.a
+%_libdir/libsolv.so
+%_libdir/libsolvext.so
 /usr/include/solv
-/usr/bin/deptestomatic
 /usr/bin/helix2solv
 
 %files demo

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 075d0a7f2e2bf257482554f7e792824d80cd690b..c3750e07c130680196fececde04c967fdfd3c66d 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -23,7 +23,7 @@ SET (libsolv_HEADERS
     poolid.h pooltypes.h queue.h solvable.h solver.h solverdebug.h
     repo.h repodata.h repopage.h repo_solv.h util.h
     strpool.h dirpool.h knownid.h transaction.h rules.h problems.h
-    chksum.h md5.h sha1.h sha2.h ${CMAKE_BINARY_DIR}/src/satversion.h)
+    chksum.h ${CMAKE_BINARY_DIR}/src/satversion.h)
 
 SET (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")
 SET (CMAKE_SHARED_LINKER_FLAGS "${LINK_FLAGS} -Wl,--version-script=${CMAKE_SOURCE_DIR}/src/libsolv.ver")