libsolv: Use new cmake macro.

[ipfire-3.x.git] / libsolv / libsolv.nm

diff --git a/libsolv/libsolv.nm b/libsolv/libsolv.nm
index 2750d22e0772af14ab3978587331b5e370701249..7b8413421e659f6ae9550cebc20546ca20a42863 100644 (file)
--- a/libsolv/libsolv.nm
+++ b/libsolv/libsolv.nm
@@ -5,8 +5,8 @@
 
 name       = libsolv
 version    = 0.0.0
-git_ver    = 0db9d7f
-release    = 3.git%{git_ver}
+git_ver    = c02d759
+release    = 6.git%{git_ver}
 
 maintainer = Michael Tremer <michael.tremer@ipfire.org>
 groups     = System/Libraries
@@ -26,51 +26,52 @@ source_dl  =
 build
        requires
                gcc-c++
-               cmake
+               cmake >= 2.8.4-2
                db4-devel
                expat-devel
                zlib-devel
        end
 
        prepare_cmds
-               # Remove -Werror from gcc command line.
-               find . -name CMakeLists.txt | xargs sed -e "s/-Werror//g" -i
-
-               # Do not build bindings, examples and tools.
-               sed "/bindings/d" -i CMakeLists.txt
-               sed "/examples/d" -i CMakeLists.txt
-               sed "/tools/d" -i CMakeLists.txt
-
                # Make sure that libsatsolverext is linked properly to all needed
                # libraries.
                echo "TARGET_LINK_LIBRARIES(libsolvext libsolv \${EXPAT_LIBRARY} \${ZLIB_LIBRARY})" \
                        >> ext/CMakeLists.txt
-
-               # Remove the RPM stuff when we build with -DFEDORA=1 because we
-               # do not support RPM.
-               sed -e "s/DEBIAN/FEDORA/g" -i ext/CMakeLists.txt
        end
 
        build
                mkdir build
-               cd build && cmake .. -DFEDORA=1 \
-                       -DCMAKE_INSTALL_PREFIX=/usr \
-                       -DCMAKE_BUILD_TYPE=Release \
-                       -DCMAKE_SKIP_RPATH=1
+               cd build && %{cmake} .. \
+                       -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+                       -DENABLE_PERL=0 \
+                       -DENABLE_PYTHON=0 \
+                       -DENABLE_RUBY=0
                make %{PARALELLISMFLAGS}
        end
 
        install
                cd build && make install DESTDIR=%{BUILDROOT}
-
-               # Remove unusable header.
-               rm -vf %{BUILDROOT}/usr/include/solv/repo_rpmdb.h
+               rm -vf %{BUILDROOT}%{bindir}/{,test}solv
        end
 end
 
 packages
        package %{name}
 
+       package %{name}-tools
+               summary = Tools to manipulate .solv files.
+
+               requires
+                       bzip2
+                       coreutils
+                       gzip
+               end
+
+               files
+                       %{bindir}
+               end
+       end
+
        package %{name}-devel
                template DEVEL
        end