From b63f174d206492e4651f10159f9dba5e47a424e1ddbbd708274bc73b2ee53624 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Fri, 11 Jun 2010 08:35:22 +0000 Subject: [PATCH] Accepting request 41345 from devel:tools:building Copy from devel:tools:building/cmake based on submit request 41345 from user prusnak OBS-URL: https://build.opensuse.org/request/show/41345 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/cmake?expand=0&rev=37 --- cmake-gui.spec | 2 +- cmake.changes | 11 +++++++++++ cmake.spec | 12 ++++++++---- 3 files changed, 20 insertions(+), 5 deletions(-) diff --git a/cmake-gui.spec b/cmake-gui.spec index 3997aeb..057d220 100644 --- a/cmake-gui.spec +++ b/cmake-gui.spec @@ -20,7 +20,7 @@ Name: cmake-gui Version: 2.8.1 -Release: 2 +Release: 3 License: BSD3c Group: Development/Tools/Building Url: http://www.cmake.org/ diff --git a/cmake.changes b/cmake.changes index 39e90c8..f7392d1 100644 --- a/cmake.changes +++ b/cmake.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Thu Jun 10 16:24:47 UTC 2010 - dimstar@opensuse.org + +- Fix build on Fedora, by not using defaultdocdir. It does not + match the forced installation path on configure. + +------------------------------------------------------------------- +Thu Jun 3 16:03:36 UTC 2010 - dimstar@opensuse.org + +- No fdupes on non-suse platforms and SLE10. + ------------------------------------------------------------------- Tue May 18 12:17:02 UTC 2010 - puzel@novell.com diff --git a/cmake.spec b/cmake.spec index 53eecd7..b6de31e 100644 --- a/cmake.spec +++ b/cmake.spec @@ -20,7 +20,7 @@ Name: cmake Version: 2.8.1 -Release: 2 +Release: 3 License: BSD3c Group: Development/Tools/Building Url: http://www.cmake.org/ @@ -29,7 +29,9 @@ Patch4: cmake-disable-builtin-chrpath.diff Patch5: fortify-buffer-overflows.diff Summary: Cross-platform, open-source make system BuildRoot: %{_tmppath}/%{name}-%{version}-build +%if 0%{?suse_version} > 1110 BuildRequires: fdupes +%endif BuildRequires: curl-devel BuildRequires: gcc-c++ BuildRequires: libexpat-devel @@ -67,8 +69,10 @@ make VERBOSE=1 %{?jobs:-j %jobs} make DESTDIR=%{buildroot} install 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 +cp ChangeLog.manual %{buildroot}/usr/share/doc/packages/%{name}/Changelog +%if 0%{?suse_version} > 1110 %fdupes %buildroot/usr/share/cmake +%endif %clean rm -rf %{buildroot} @@ -80,8 +84,8 @@ rm -rf %{buildroot} %{_bindir}/ctest %{_bindir}/ccmake %{_datadir}/cmake -%_libdir/cmake -%doc %{_defaultdocdir}/%{name} +%{_libdir}/cmake +%doc %{_datadir}/doc/packages/%{name} %doc %{_mandir}/man1/cmakepolicies.1.* %doc %{_mandir}/man1/cmake.1.* %doc %{_mandir}/man1/ctest.1.*