From 0a294c7e863cc164edd393131e8294303256fe3dc22e8ee8066525caa6b4a125 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Fri, 11 Jun 2010 08:29:52 +0000 Subject: [PATCH] Accepting request 41334 from home:dimstar:libproxy Copy from home:dimstar:libproxy/cmake via accept of submit request 41334 revision 10. Request was accepted with message: Reviewed ok OBS-URL: https://build.opensuse.org/request/show/41334 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=61 --- cmake.changes | 11 +++++++++++ cmake.spec | 10 +++++++--- 2 files changed, 18 insertions(+), 3 deletions(-) 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..76a64f3 100644 --- a/cmake.spec +++ b/cmake.spec @@ -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.*