commit cmake for openSUSE:Factory
![](https://seccdn.libravatar.org/avatar/e2145bc5cf53dda95c308a3c75e8fef3.jpg?s=120&d=mm&r=g)
Hello community,
here is the log from the commit of package cmake for openSUSE:Factory checked in at 2013-08-19 13:31:18
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/cmake (Old)
and /work/SRC/openSUSE:Factory/.cmake.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cmake"
Changes:
--------
--- /work/SRC/openSUSE:Factory/cmake/cmake.changes 2013-08-04 16:48:31.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.cmake.new/cmake.changes 2013-08-19 13:31:20.000000000 +0200
@@ -1,0 +2,23 @@
+Mon Aug 12 19:21:05 UTC 2013 - tchvatal@suse.com
+
+- One more backslash here.
+
+-------------------------------------------------------------------
+Mon Aug 12 19:03:31 UTC 2013 - tchvatal@suse.com
+
+- Backshlashes were missing in macros.
+
+-------------------------------------------------------------------
+Mon Aug 12 18:51:14 UTC 2013 - tchvatal@suse.com
+
+- Add opensuse_rules.cmake to set the default compiler and linker
+ opts. Tweak a bit the macro to not let upstreams twerk with the
+ cmake files too much.
+
+-------------------------------------------------------------------
+Sun Aug 11 11:20:12 UTC 2013 - tchvatal@suse.com
+
+- Provide macros.cmake which contains %cmake macro to reduce
+ mess in the spec files.
+
+-------------------------------------------------------------------
New:
----
cmake.macros
opensuse_rules.cmake
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ cmake.spec ++++++
--- /var/tmp/diff_new_pack.CeKihF/_old 2013-08-19 13:31:21.000000000 +0200
+++ /var/tmp/diff_new_pack.CeKihF/_new 2013-08-19 13:31:21.000000000 +0200
@@ -21,6 +21,8 @@
Release: 0
Url: http://www.cmake.org/
Source0: http://www.cmake.org/files/v2.8/%{name}-%{version}.tar.gz
+Source1: cmake.macros
+Source2: opensuse_rules.cmake
Patch2: cmake-fix-ruby-test.patch
Patch3: cmake-fix-ImageMagick6.patch
Patch4: cmake-cmCustomCommand_add_operator=.patch
@@ -80,13 +82,21 @@
mkdir -p %{buildroot}%{_libdir}/cmake
find %{buildroot}/usr/share/cmake -type f -print0 | xargs -0 chmod 644
cp ChangeLog.manual %{buildroot}/usr/share/doc/packages/%{name}/Changelog
+# rpm macros
+install -m644 %{SOURCE1} -D %{buildroot}%{_sysconfdir}/rpm/macros.cmake
+# buildrules
+install -m644 %{SOURCE2} -D %{buildroot}%{_datadir}/cmake/Modules/opensuse_rules.cmake
+sed -i \
+ -e 's:OPTFLAGS:%{optflags}:g' \
+ %{buildroot}%{_datadir}/cmake/Modules/opensuse_rules.cmake
%if 0%{?suse_version}
-%fdupes %buildroot/usr/share/cmake
+%fdupes %{buildroot}/usr/share/cmake
%endif
%files
%defattr(-,root,root)
+%{_sysconfdir}/rpm/macros.cmake
%{_bindir}/cpack
%{_bindir}/cmake
%{_bindir}/ctest
++++++ cmake.macros ++++++
#
# Macros for cmake
#
%__cmake %{_bindir}/cmake
%_cmake_debug %{?with_debug:debug}%{?!with_debug:release}
%cmake \
CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ; \
CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ; \
FFLAGS="${FFLAGS:-%optflags%{?_fmoddir: -I%_fmoddir}}" ; export FFLAGS ; \
find . -name CMakeLists.txt \\\
-exec sed -i -e '/^[[:space:]]*[sS][eE][tT][[:space:]]*([[:space:]]*CMAKE_BUILD_TYPE.*)/{s/^/#IGNORE /g}' {} + \\\
-exec sed -i -e '/^[[:space:]]*[sS][eE][tT][[:space:]]*([[:space:]]*CMAKE_COLOR_MAKEFILE.*)/{s/^/#IGNORE /g}' {} + \\\
-exec sed -i -e '/^[[:space:]]*[sS][eE][tT][[:space:]]*([[:space:]]*CMAKE_INSTALL_PREFIX.*)/{s/^/#IGNORE /g}' {} + \\\
-exec sed -i -e '/^[[:space:]]*[sS][eE][tT][[:space:]]*([[:space:]]*CMAKE_VERBOSE_MAKEFILE.*)/{s/^/#IGNORE /g}' {} + \
mkdir -p build \
cd build \
%define enable_debug 1 \
%{?_enable_debug: %{expand: %%global enable_debug 1}} \
%__cmake .. \\\
-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} \\\
-DCMAKE_BUILD_TYPE=%{_cmake_debug} \\\
%if "%{?_lib}" == "lib64" \
-DLIB_SUFFIX=64 \\\
%endif \
-DCMAKE_SKIP_RPATH:BOOL=ON \\\
-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \\\
-DBUILD_SHARED_LIBS:BOOL=ON \\\
-DBUILD_STATIC_LIBS:BOOL=OFF \\\
-DCMAKE_COLOR_MAKEFILE:BOOL=OFF \\\
-DCMAKE_INSTALL_DO_STRIP:BOOL=OFF \\\
-DCMAKE_USER_MAKE_RULES_OVERRIDE="/usr/share/cmake/Modules/opensuse_rules.cmake"
%cmake_install \
cd build \
make DESTDIR=%{buildroot} install/fast \
cd ..
++++++ opensuse_rules.cmake ++++++
SET (CMAKE_AR /usr/bin/ar CACHE FILEPATH "Archive manager" FORCE)
SET (CMAKE_ASM_COMPILE_OBJECT "
participants (1)
-
root@hilbert.suse.de