rpms/speedcrunch/devel sources, 1.5, 1.6 speedcrunch.spec, 1.15, 1.16 speedcrunch.desktop, 1.5, NONE

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/speedcrunch/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv24479

Modified Files:
	sources speedcrunch.spec 
Removed Files:
	speedcrunch.desktop 
Log Message:
* Thu Jun 24 2010 Rex Dieter <rdieter at fedoraproject.org> - 0.11-0.1.alpha
- speedcrunch-0.11-alpha
- update cmake-related macros
- optimize scriptlets
- %summary: drop 'for KDE', should be quite usable on any DE
- use upstream-provided .desktop file
- %check: make test



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/speedcrunch/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	17 Apr 2008 20:57:03 -0000	1.5
+++ sources	25 Jun 2010 17:41:40 -0000	1.6
@@ -1 +1 @@
-ad6789a35d568cb761ccb770eecd2b4e  speedcrunch-0.10.tar.gz
+36e5588cc7dd1f0d50ddad194d7743e7  speedcrunch-0.11-alpha.tar.gz


Index: speedcrunch.spec
===================================================================
RCS file: /cvs/pkgs/rpms/speedcrunch/devel/speedcrunch.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- speedcrunch.spec	27 Jul 2009 04:40:18 -0000	1.15
+++ speedcrunch.spec	25 Jun 2010 17:41:40 -0000	1.16
@@ -1,17 +1,22 @@
+
+%define pre alpha
+
 Name:           speedcrunch
-Version:        0.10
-Release:        3%{?dist}
-Summary:        A fast power user calculator for KDE
+Version:        0.11
+Release:        0.1.%{pre}%{?dist}
+Summary:        A fast power user calculator
 
 Group:          Applications/Engineering
 License:        GPLv2+
 URL:            http://speedcrunch.digitalfanatics.org
-Source0:        http://speedcrunch.googlecode.com/files/speedcrunch-%{version}.tar.gz 
-Source1:        speedcrunch.desktop
+Source0:        http://speedcrunch.googlecode.com/files/speedcrunch-%{version}%{?pre:-%{pre}}.tar.gz 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  cmake qt4-devel desktop-file-utils ImageMagick
-#Requires:       
+
+# to be paranoid and include a minimal qt4 dep (ie, require at least the
+# same or higher qt4 version than what was used to build it) -- Rex
+%{?_qt4_version:Requires: qt4%{?_isa} >= %{_qt4_version}}
 
 %description
 SpeedCrunch is a fast, high precision and powerful desktop calculator.
@@ -20,44 +25,53 @@ precisions, unlimited variable storage, 
 full keyboard-friendly and more than 15 built-in math function.
 
 %prep
-%setup -q
+%setup -q -n speedcrunch-%{version}%{?pre:-%{pre}}
+
 sed -i 's/\r//' COPYING ChangeLog README
 
+
 %build
-mkdir fedora
-cd fedora
-export CFLAGS="$RPM_OPT_FLAGS"
-export CXXFLAGS="$RPM_OPT_FLAGS"
-export FFLAGS="$RPM_OPT_FLAGS"
-cmake ../src \
-        -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \
-        -DBUILD_SHARED_LIBS:BOOL=ON
-make VERBOSE=1 %{?_smp_mflags}
+
+mkdir -p %{_target_platform}
+pushd %{_target_platform}
+%{cmake} ../src
+popd
+
+make %{?_smp_mflags} -C %{_target_platform}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-cd fedora
-make install DESTDIR=$RPM_BUILD_ROOT
+make install/fast DESTDIR=$RPM_BUILD_ROOT -C %{_target_platform}
 
 # Create icons on the fly
-cd ../src/resources
+pushd src/resources
 for size in 16 24 32 48 64; do
     mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${size}x${size}/apps
     convert -size ${size}x${size} speedcrunch.png \
         $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${size}x${size}/apps/speedcrunch.png
+    touch --reference speedcrunch.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${size}x${size}/apps/speedcrunch.png
 done
+popd
 
 desktop-file-install --vendor=""                              \
         --dir=$RPM_BUILD_ROOT%{_datadir}/applications         \
-        %{SOURCE1}
+        src/speedcrunch.desktop 
+
+%check
+make test -C %{_target_platform}
 
 %post
-touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+if [ $1 -eq 0 ] ; then
+  touch --no-create %{_datadir}/icons/hicolor &> /dev/null
+  gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
+fi
+
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -67,11 +81,19 @@ rm -rf $RPM_BUILD_ROOT
 %doc ChangeLog COPYING README
 %{_bindir}/speedcrunch
 %{_datadir}/applications/speedcrunch.desktop
-%{_datadir}/speedcrunch
+%{_datadir}/speedcrunch/
 %{_datadir}/icons/hicolor/*/apps/speedcrunch.png
 %{_datadir}/pixmaps/speedcrunch.png
 
 %changelog
+* Thu Jun 24 2010 Rex Dieter <rdieter at fedoraproject.org> - 0.11-0.1.alpha
+- speedcrunch-0.11-alpha
+- update cmake-related macros
+- optimize scriptlets
+- %%summary: drop 'for KDE', should be quite usable on any DE
+- use upstream-provided .desktop file
+- %%check: make test
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.10-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


--- speedcrunch.desktop DELETED ---