From 44c600de8656f51556e442de562e618fa03837639af344d77b8b4501bd9f1a67 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Thu, 12 Mar 2009 14:23:49 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/cmake?expand=0&rev=27 --- cmake.changes | 5 +++++ cmake.spec | 11 ++++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/cmake.changes b/cmake.changes index 81dca6d..6e6b192 100644 --- a/cmake.changes +++ b/cmake.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Mar 11 11:13:27 CET 2009 - dmueller@suse.de + +- build fixes for non-suse distros + ------------------------------------------------------------------- Tue Mar 3 08:07:25 CET 2009 - puzel@suse.cz diff --git a/cmake.spec b/cmake.spec index 7a23182..277f2b1 100644 --- a/cmake.spec +++ b/cmake.spec @@ -20,7 +20,7 @@ Name: cmake Version: 2.6.3 -Release: 1 +Release: 2 License: BSD 3-Clause Group: Development/Tools/Building %define tar_version %version @@ -33,10 +33,9 @@ Patch5: ibm-java-paths.diff Summary: Cross-platform, open-source make system BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} > 1020 -BuildRequires: libexpat-devel libqt4-devel update-desktop-files +BuildRequires: fdupes libexpat-devel libqt4-devel update-desktop-files %endif BuildRequires: curl-devel expat gcc-c++ ncurses-devel openssl-devel zlib-devel -BuildRequires: fdupes Requires: make %description @@ -97,8 +96,8 @@ make DESTDIR=%{buildroot} install find %{buildroot}/usr/share/cmake -type f -print0 | xargs -0 chmod 644 %if 0%{?suse_version} > 1020 %suse_update_desktop_file CMake Development IDE Tools Qt +%fdupes %buildroot/usr/share/cmake %endif -%fdupes %buildroot %clean rm -rf %{buildroot} @@ -121,8 +120,8 @@ rm -rf %{buildroot} %doc %_mandir/man1/cmakeprops.1.* %doc %_mandir/man1/cmakevars.1.* %doc %_mandir/man1/cpack.1.* -%doc %_mandir/man1/cmake-gui.1.* %if 0%{?suse_version} > 1020 +%doc %_mandir/man1/cmake-gui.1.* %files gui %defattr(-,root,root) @@ -133,6 +132,8 @@ rm -rf %{buildroot} %endif %changelog +* Wed Mar 11 2009 dmueller@suse.de +- build fixes for non-suse distros * Tue Mar 03 2009 puzel@suse.cz - update to 2.6.3 - add parenthetical expressions to if