This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 3.x development tree".

The branch, master has been updated via 37b505df98dcef881e4481e6a8602fe32203844c (commit) via bc83f18086e88adab2a63b65cafc7e146b91d743 (commit) via deee147b09972aab9df623f42089f9b2df505f14 (commit) from 5e82b005adcd7992d4961acd4eca68401721db5a (commit)

Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.

- Log ----------------------------------------------------------------- commit 37b505df98dcef881e4481e6a8602fe32203844c Merge: bc83f18 5e82b00 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Oct 9 14:32:21 2012 +0200

Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x

commit bc83f18086e88adab2a63b65cafc7e146b91d743 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Oct 9 14:27:32 2012 +0200

libsolv: Use new cmake macro.

commit deee147b09972aab9df623f42089f9b2df505f14 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Oct 9 14:26:00 2012 +0200

cmake: Add pakfire macro.

This macro makes it more easy to build packages in a consistent way with cmake.

-----------------------------------------------------------------------

Summary of changes: cmake/cmake.macro | 18 ++++++++++++++++++ cmake/cmake.nm | 8 ++++++-- libsolv/libsolv.nm | 7 +++---- 3 files changed, 27 insertions(+), 6 deletions(-) create mode 100644 cmake/cmake.macro

Difference in files: diff --git a/cmake/cmake.macro b/cmake/cmake.macro new file mode 100644 index 0000000..222a950 --- /dev/null +++ b/cmake/cmake.macro @@ -0,0 +1,18 @@ +# +# cmake macros +# + +__cmake = /usr/bin/cmake +if "${lib}" == "lib64" + __cmake_lib_suffix = -DLIB_SUFFIX=64 +end + +cmake = %{__cmake} \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DCMAKE_INSTALL_PREFIX:PATH=%{prefix} \ + -DINCLUDE_INSTALL_DIR:PATH=%{includedir} \ + -DLIB_INSTALL_DIR:PATH=%{libdir} \ + -DSYSCONF_INSTALL_DIR:PATH=%{sysconfdir} \ + -DSHARE_INSTALL_PREFIX:PATH=%{datadir} \ + %{__cmake_lib_suffix} \ + -DBUILD_SHARED_LIBS:BOOL=ON diff --git a/cmake/cmake.nm b/cmake/cmake.nm index ddbe23a..c037f87 100644 --- a/cmake/cmake.nm +++ b/cmake/cmake.nm @@ -5,7 +5,7 @@

name = cmake version = 2.8.4 -release = 1 +release = 2

groups = Development/Tools url = http://www.cmake.org @@ -60,12 +60,16 @@ build

install cd build && make install DESTDIR=%{BUILDROOT} + + # Install pakfire macro. + mkdir -p %{BUILDROOT}/usr/lib/pakfire/macros + install -v -m 644 %{DIR_SOURCE}/cmake.macro \ + %{BUILDROOT}/usr/lib/pakfire/macros end end

packages package %{name} - end

package %{name}-debuginfo template DEBUGINFO diff --git a/libsolv/libsolv.nm b/libsolv/libsolv.nm index 5a9963b..7b84134 100644 --- a/libsolv/libsolv.nm +++ b/libsolv/libsolv.nm @@ -6,7 +6,7 @@ name = libsolv version = 0.0.0 git_ver = c02d759 -release = 5.git%{git_ver} +release = 6.git%{git_ver}

maintainer = Michael Tremer michael.tremer@ipfire.org groups = System/Libraries @@ -26,7 +26,7 @@ source_dl = build requires gcc-c++ - cmake + cmake >= 2.8.4-2 db4-devel expat-devel zlib-devel @@ -41,8 +41,7 @@ build

build mkdir build - cd build && cmake .. \ - -DCMAKE_INSTALL_PREFIX=/usr \ + cd build && %{cmake} .. \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DENABLE_PERL=0 \ -DENABLE_PYTHON=0 \

hooks/post-receive -- IPFire 3.x development tree