- Cleanup with spec-cleaner and remove support for sle10.

- Cleanup with spec-cleaner and remove sle10 support.

OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=156

cmake-gui.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sat Jun 21 10:42:41 UTC 2014 - tchvatal@suse.com
+
+- Cleanup with spec-cleaner and remove support for sle10.
+
 -------------------------------------------------------------------
 Wed Jun 11 04:41:58 UTC 2014 - foss@grueninger.de
 

cmake-gui.spec

@@ -19,46 +19,38 @@
 Name:           cmake-gui
 Version:        3.0.0
 Release:        0
-%define rversion 3.0.0
-Url:            http://www.cmake.org/
-Source0:        http://www.cmake.org/files/v3.0/cmake-%{rversion}.tar.gz
 Summary:        CMake graphical user interface
 License:        BSD-3-Clause
 Group:          Development/Tools/Building
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+Url:            http://www.cmake.org/
-%if 0%{?suse_version}
+Source0:        http://www.cmake.org/files/v3.0/cmake-%{version}.tar.gz
-BuildRequires:  fdupes
-%if 0%{?sles_version} != 10
-BuildRequires:  libarchive-devel
-%endif
-BuildRequires:  libexpat-devel
-%else
-BuildRequires:  expat-devel
-%endif
 BuildRequires:  curl-devel
+BuildRequires:  fdupes
 BuildRequires:  gcc-c++
+BuildRequires:  libarchive-devel
+BuildRequires:  libexpat-devel
+BuildRequires:  openssl-devel
+BuildRequires:  update-desktop-files
+BuildRequires:  zlib-devel
+BuildRequires:  pkgconfig(bzip2)
+Requires:       cmake
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if 0%{?suse_version} >= 1320
 BuildRequires:  pkgconfig(Qt5Widgets)
 %else
 BuildRequires:  libqt4-devel
 %endif
-BuildRequires:  openssl-devel
-BuildRequires:  update-desktop-files
-BuildRequires:  zlib-devel
-BuildRequires:  pkgconfig(bzip2)
-
-Requires:       cmake
 
 %description
 This is a Graphical User Interface for CMake, a cross-platform,
 open-source build system.
 
 %prep
-%setup -q -n cmake-%{rversion}
+%setup -q
 
 %build
 EXTRA_FLAGS="--qt-gui"
-export CXXFLAGS="$RPM_OPT_FLAGS"
+export CXXFLAGS="%{optflags}"
 export CFLAGS="$CXXFLAGS"
 ./configure \
     --prefix=%{_prefix} \
@@ -74,19 +66,19 @@ export CFLAGS="$CXXFLAGS"
     --system-bzip2 \
     --no-system-libarchive \
 %endif
-    --parallel=0%jobs \
+    --parallel=0%{jobs} \
     --qt-gui
 make VERBOSE=1 %{?_smp_mflags}
 
 %install
-make DESTDIR=%{buildroot} install
+make DESTDIR=%{buildroot} install %{?_smp_mflags}
 mkdir -p %{buildroot}%{_libdir}/cmake
 %suse_update_desktop_file CMake Development IDE Tools Qt
 # delete files that belong to the 'cmake' package
-rm -rf %{buildroot}/usr/bin/{cpack,cmake,ctest}
+rm -rf %{buildroot}%{_bindir}/{cpack,cmake,ctest}
-rm -rf %{buildroot}/usr/share/cmake
+rm -rf %{buildroot}%{_datadir}/cmake
-rm -rf %{buildroot}/usr/share/aclocal/cmake.m4
+rm -rf %{buildroot}%{_datadir}/aclocal/cmake.m4
-rm -rf %{buildroot}/usr/share/doc/packages/cmake
+rm -rf %{buildroot}%{_docdir}/cmake
 
 %files
 %defattr(-,root,root)

cmake.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sat Jun 21 10:40:48 UTC 2014 - tchvatal@suse.com
+
+- Cleanup with spec-cleaner and remove sle10 support.
+
 -------------------------------------------------------------------
 Wed Jun 11 04:40:51 UTC 2014 - foss@grueninger.de
 

cmake.spec

@@ -19,41 +19,35 @@
 Name:           cmake
 Version:        3.0.0
 Release:        0
-%define rversion 3.0.0
-Url:            http://www.cmake.org/
-Source0:        http://www.cmake.org/files/v3.0/%{name}-%{rversion}.tar.gz
-Source1:        cmake.macros
-Source2:        opensuse_rules.cmake
-Patch2:         cmake-fix-ruby-test.patch
 Summary:        Cross-platform, open-source make system
 License:        BSD-3-Clause
 Group:          Development/Tools/Building
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+Url:            http://www.cmake.org/
-%if 0%{?suse_version}
+Source0:        http://www.cmake.org/files/v3.0/%{name}-%{version}.tar.gz
-%if 0%{?suse_version} > 1010
+Source1:        cmake.macros
+Source2:        opensuse_rules.cmake
+Patch2:         cmake-fix-ruby-test.patch
 BuildRequires:  fdupes
-%endif
+BuildRequires:  gcc-c++
+BuildRequires:  libexpat-devel
+BuildRequires:  ncurses-devel
+BuildRequires:  zlib-devel
+Requires:       make
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if 0%{?suse_version} > 1110
 BuildRequires:  libarchive-devel
 BuildRequires:  libbz2-devel
 %endif
-BuildRequires:  libexpat-devel
-%endif
-BuildRequires:  gcc-c++
-BuildRequires:  ncurses-devel
-BuildRequires:  zlib-devel
-
-Requires:       make
 
 %description
 CMake is a cross-platform, open-source build system
 
 %prep
-%setup -q -n %{name}-%{rversion}
+%setup -q
 %patch2 -p1
 
 %build
-export CXXFLAGS="$RPM_OPT_FLAGS"
+export CXXFLAGS="%{optflags}"
 export CFLAGS="$CXXFLAGS"
 ./configure \
     --prefix=%{_prefix} \
@@ -65,15 +59,15 @@ export CFLAGS="$CXXFLAGS"
 %if 0%{?suse_version} <= 1110
     --no-system-libarchive \
 %endif
-    --parallel=0%jobs \
+    --parallel=0%{jobs} \
     --verbose \
     --no-qt-gui
 make VERBOSE=1 %{?_smp_mflags}
 
 %install
-make DESTDIR=%{buildroot} install
+make DESTDIR=%{buildroot} install %{?_smp_mflags}
 mkdir -p %{buildroot}%{_libdir}/cmake
-find %{buildroot}/usr/share/cmake -type f -print0 | xargs -0 chmod 644
+find %{buildroot}%{_datadir}/cmake -type f -print0 | xargs -0 chmod 644
 # rpm macros
 install -m644 %{SOURCE1} -D %{buildroot}%{_sysconfdir}/rpm/macros.cmake
 # buildrules
@@ -82,9 +76,7 @@ sed -i \
     -e 's:OPTFLAGS:%{optflags}:g' \
     %{buildroot}%{_datadir}/cmake/Modules/opensuse_rules.cmake
 
-%if 0%{?suse_version} > 1010
+%fdupes %{buildroot}%{_datadir}/cmake
-%fdupes %{buildroot}/usr/share/cmake
-%endif
 
 %files
 %defattr(-,root,root)
@@ -97,6 +89,6 @@ sed -i \
 %{_libdir}/cmake
 %dir %{_datadir}/aclocal
 %{_datadir}/aclocal/cmake.m4
-%doc %{_datadir}/doc/packages/%{name}
+%doc %{_docdir}/%{name}
 
 %changelog