RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Per Øyvind Karlsen
Root: /v/rpm/cvs Email: pkarl...@rpm5.org
Module: rpm Date: 16-Oct-2010 06:37:55
Branch: HEAD Handle: 2010101604375400
Added files:
rpm/macros cmake.in
Modified files:
rpm CHANGES Makefile.am configure.ac
rpm/macros macros.in
Log:
add cmake macros from fedora/mandriva.
Summary:
Revision Changes Path
1.3472 +1 -0 rpm/CHANGES
2.259 +3 -3 rpm/Makefile.am
2.465 +4 -3 rpm/configure.ac
1.1 +28 -0 rpm/macros/cmake.in
1.37 +4 -0 rpm/macros/macros.in
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.3471 -r1.3472 CHANGES
--- rpm/CHANGES 16 Oct 2010 04:05:43 -0000 1.3471
+++ rpm/CHANGES 16 Oct 2010 04:37:54 -0000 1.3472
@@ -1,4 +1,5 @@
5.3.4 -> 5.4a1:
+ - proyvind: add cmake macros from fedora/mandriva.
- proyvind: add tcl macros from mandriva.
- proyvind: add ruby macros from mandriva.
- proyvind: add macros from mandriva that's fairly generic enough to
@@ .
patch -p0 <<'@@ .'
Index: rpm/Makefile.am
============================================================================
$ cvs diff -u -r2.258 -r2.259 Makefile.am
--- rpm/Makefile.am 16 Oct 2010 04:05:43 -0000 2.258
+++ rpm/Makefile.am 16 Oct 2010 04:37:54 -0000 2.259
@@ -134,9 +134,9 @@
pkgcfgdir = $(pkglibdir)/macros.d
pkgcfg_DATA = \
- macros/java macros/libtool macros/mandriva macros/mono macros/perl \
- macros/pkgconfig macros/php macros/python macros/ruby macros/selinux \
- macros/tcl
+ macros/cmake macros/java macros/libtool macros/mandriva macros/mono \
+ macros/perl macros/pkgconfig macros/php macros/python macros/ruby \
+ macros/selinux macros/tcl
noinst_HEADERS = build.h debug.h system.h
@@ .
patch -p0 <<'@@ .'
Index: rpm/configure.ac
============================================================================
$ cvs diff -u -r2.464 -r2.465 configure.ac
--- rpm/configure.ac 16 Oct 2010 04:05:43 -0000 2.464
+++ rpm/configure.ac 16 Oct 2010 04:37:54 -0000 2.465
@@ -463,6 +463,7 @@
AC_PATH_PROG(__CHGRP, chgrp, /bin/chgrp, $MYPATH)
AC_PATH_PROG(__CHMOD, chmod, /bin/chmod, $MYPATH)
AC_PATH_PROG(__CHOWN, chown, /bin/chown, $MYPATH)
+AC_PATH_PROG(__CMAKE, cmake, %{_bindir}/cmake, $MYPATH)
AC_PATH_PROG(__CPIO, cpio, /bin/cpio, $MYPATH)
AC_PATH_PROG(__CURL, curl, %{_bindir}/curl, $MYPATH)
AC_PATH_PROG(__CVS, cvs, %{_bindir}/cvs, $MYPATH)
@@ -2267,9 +2268,9 @@
scripts/Makefile
rpmdb/DB_CONFIG
macros/macros macros/macros.rpmbuild
- macros/java macros/libtool macros/mandriva macros/mono macros/perl
- macros/pkgconfig macros/php macros/python macros/ruby macros/selinux
- macros/tcl
+ macros/cmake macros/java macros/libtool macros/mandriva macros/mono
+ macros/perl macros/pkgconfig macros/php macros/python macros/ruby
+ macros/selinux macros/tcl
doc/Makefile
doc/manual/Makefile doc/fr/Makefile doc/ja/Makefile doc/ko/Makefile
doc/pl/Makefile doc/ru/Makefile doc/sk/Makefile
@@ .
patch -p0 <<'@@ .'
Index: rpm/macros/cmake.in
============================================================================
$ cvs diff -u -r0 -r1.1 cmake.in
--- /dev/null 2010-10-16 06:34:06.000000000 +0200
+++ cmake.in 2010-10-16 06:37:54.643451328 +0200
@@ -0,0 +1,28 @@
+# Ruby specific macro definitions.
+# To make use of these macros insert the following line into your spec file:
+# %{load:%{_usrlibrpm}/macros.d/cmake}
+
+%__cmake @__CMAKE@
+
+%_cmake_lib_suffix64 -DLIB_SUFFIX=64
+%_cmake_skip_rpath -DCMAKE_SKIP_RPATH:BOOL=ON
+%_cmake_verbose -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON
+%_cmake_version %(%{__cmake} --version|sed -e 's#.*
\(\S*\)$#\1#g')
+
+%cmake \
+ CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ; \
+ CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ; \
+ FFLAGS="${FFLAGS:-%optflags}" ; export FFLAGS ; \
+ %{__cmake} \\\
+ %{_cmake_skip_rpath} \\\
+ %{_cmake_verbose} \\\
+ -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \\\
+ -DCMAKE_INSTALL_LIBDIR:PATH=%{_libdir} \\\
+ -DINCLUDE_INSTALL_DIR:PATH=%{_includedir} \\\
+ -DLIB_INSTALL_DIR:PATH=%{_libdir} \\\
+ -DSYSCONF_INSTALL_DIR:PATH=%{_sysconfdir} \\\
+ -DSHARE_INSTALL_PREFIX:PATH=%{_datadir} \\\
+%if "%{?_lib}" == "lib64" \
+ %{?_cmake_lib_suffix64} \\\
+%endif \
+ -DBUILD_SHARED_LIBS:BOOL=ON
@@ .
patch -p0 <<'@@ .'
Index: rpm/macros/macros.in
============================================================================
$ cvs diff -u -r1.36 -r1.37 macros.in
--- rpm/macros/macros.in 16 Oct 2010 04:05:42 -0000 1.36
+++ rpm/macros/macros.in 16 Oct 2010 04:37:54 -0000 1.37
@@ -1,7 +1,7 @@
#/*! \page config_macros Default configuration: @USRLIBRPM@/macros
# \verbatim
#
-# $Id: macros.in,v 1.36 2010/10/16 04:05:42 pkarlsen Exp $
+# $Id: macros.in,v 1.37 2010/10/16 04:37:54 pkarlsen Exp $
#
# This is a global RPM configuration file. All changes made here will
# be lost when the rpm package is upgraded. Any per-system configuration
@@ -912,6 +912,10 @@
#}1}%{rpm_license_check}
#------------------------------------------------------------------------
+# cmake(...) configuration
+%{load:%{_usrlibrpm}/macros.d/cmake}
+
+#------------------------------------------------------------------------
# perl(...) configuration
%{load:%{_usrlibrpm}/macros.d/perl}
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
