[ultimatestunts] update to upstream version 0771

Dan Horák sharkcz at fedoraproject.org
Mon Sep 10 15:00:29 UTC 2012


commit 539af0dd7c6ab9909fe216ad2abd3d432b3d1708
Author: Dan Horák <dan at danny.cz>
Date:   Mon Sep 10 17:00:24 2012 +0200

    update to upstream version 0771

 .gitignore          |    1 +
 sources             |    2 +-
 ultimatestunts.spec |   24 ++++++++++++------------
 3 files changed, 14 insertions(+), 13 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 52d06b7..3fadb27 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 ultimatestunts-srcdata-0751.tar.gz
 /ultimatestunts-srcdata-0761.tar.gz
+/ultimatestunts-srcdata-0771.tar.gz
diff --git a/sources b/sources
index 4e934cd..b94caf8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-117745dd282f9904c2d641d7f19714f7  ultimatestunts-srcdata-0761.tar.gz
+f62f7360c0a5024097348706b63ef826  ultimatestunts-srcdata-0771.tar.gz
diff --git a/ultimatestunts.spec b/ultimatestunts.spec
index 8b797f7..7741338 100644
--- a/ultimatestunts.spec
+++ b/ultimatestunts.spec
@@ -1,8 +1,8 @@
-%define	ver	0761
+%define	ver	0771
 
 Name:		ultimatestunts
-Version:	0.7.6
-Release:	5%{?dist}
+Version:	0.7.7
+Release:	1%{?dist}
 Summary:	Remake of the famous DOS-game Stunts
 
 Group:		Amusements/Games
@@ -13,7 +13,6 @@ Source1:	%{name}.desktop
 Patch0:		ultimatestunts-0761-make.patch
 Patch1:		ultimatestunts-0751-locale.patch
 Patch2:		ultimatestunts-0761-unistd.patch
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	dos2unix
 BuildRequires:	freealut-devel
@@ -41,8 +40,8 @@ graphics, 3D sound and internet multiplaying.
 %patch1 -p0 -b .locale
 %patch2 -p1 -b .unistd
 
-# remove CVS control files
-find . -name CVS -type d -print0 | xargs -0 rm -rf
+# remove SVN control files
+find . -name .svn -type d -print0 | xargs -0 rm -rf
 
 # fixup access
 find ./data -type d -print0 | xargs -0 chmod a+rx
@@ -75,13 +74,16 @@ do
 done
 popd
 
+# ensure the config gets regenerated with correct $datadir
+rm -f %{name}.conf
+
+
 %build
 %configure
 make %{?_smp_mflags}
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT \
 	usdatadir=$RPM_BUILD_ROOT%{_datadir}/%{name} \
 	localedir=%{_datadir}/locale
@@ -95,12 +97,7 @@ desktop-file-install --vendor fedora \
 	%{SOURCE1}
 
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
 %files -f %{name}.lang
-%defattr(-,root,root,-)
 %doc COPYING doc/*
 %{_bindir}/ustunts*
 %config(noreplace) %{_sysconfdir}/%{name}.conf
@@ -109,6 +106,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Sep 10 2012 Dan Horák <dan[at]danny.cz> - 0.7.7-1
+- update to upstream version 0771
+
 * Sun Jul 22 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7.6-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 


More information about the scm-commits mailing list