[FlightGear-data/f15] Revert "new upstream release"

Fabrice Bellet bellet at fedoraproject.org
Thu Sep 8 08:43:42 UTC 2011


commit c58978de08718d004b430f525852fb6a2a3510d2
Author: Fabrice Bellet <fabrice at bellet.info>
Date:   Thu Sep 8 10:32:28 2011 +0200

    Revert "new upstream release"
    
    This reverts commit 43c82e1b9db1d72b5920aba793642d59b5125ad0.

 .gitignore           |    1 -
 FlightGear-data.spec |   26 +++++++++++---------------
 sources              |    2 +-
 3 files changed, 12 insertions(+), 17 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a917750..a168463 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
 FlightGear-data-2.0.0.tar.bz2
-/FlightGear-data-2.4.0.tar.bz2
diff --git a/FlightGear-data.spec b/FlightGear-data.spec
index 8f324a0..33f5814 100644
--- a/FlightGear-data.spec
+++ b/FlightGear-data.spec
@@ -1,7 +1,7 @@
 Name:		FlightGear-data
 Summary:	FlightGear base scenery and data files
-Version:	2.4.0
-Release:	1%{?dist}
+Version:	2.0.0
+Release:	3%{?dist}
 
 License:	GPLv2+
 Group:		Amusements/Games
@@ -21,32 +21,32 @@ installed
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_datadir}/flightgear
+install -d $RPM_BUILD_ROOT%{_datadir}/FlightGear
 tar jxf %{SOURCE0} --strip-components 1 \
-	-C $RPM_BUILD_ROOT/%{_datadir}/flightgear
+	-C $RPM_BUILD_ROOT/%{_datadir}/FlightGear
 
 # cleanup temporary files and fix permissions
-find $RPM_BUILD_ROOT/%{_datadir}/flightgear -name '*#*' -exec rm {} \;
-find $RPM_BUILD_ROOT/%{_datadir}/flightgear -type f -exec chmod 644 {} \;
+find $RPM_BUILD_ROOT/%{_datadir}/FlightGear -name '*#*' -exec rm {} \;
+find $RPM_BUILD_ROOT/%{_datadir}/FlightGear -type f -exec chmod 644 {} \;
 
 # fix wrong eol encoding on some doc files
 for f in Docs/FGShortRef.css Docs/README.kln89.html Docs/FGShortRef.html \
 	Docs/README.submodels Docs/README.yasim Docs/README.xmlparticles
 do
-	sed -i 's/\r//' $RPM_BUILD_ROOT/%{_datadir}/flightgear/$f
+	sed -i 's/\r//' $RPM_BUILD_ROOT/%{_datadir}/FlightGear/$f
 done
 
 # remove hidden dirs
 for d in Aircraft/c172/Panels/Textures/.xvpics \
 	Textures/Runway/.xvpics
 do
-	rm -rf $RPM_BUILD_ROOT/%{_datadir}/flightgear/$d
+	rm -rf $RPM_BUILD_ROOT/%{_datadir}/FlightGear/$d
 done
 
 # fix files not in utf-8
 for f in Thanks Docs/README.xmlparticles Aircraft/c172p/Models/Immat/immat.xml
 do
-	path=$RPM_BUILD_ROOT/%{_datadir}/flightgear/$f
+	path=$RPM_BUILD_ROOT/%{_datadir}/FlightGear/$f
 	iconv -f iso-8859-1 -t utf-8 -o ${path}.utf8 $path
 	mv -f ${path}.utf8 ${path}
 done
@@ -55,7 +55,7 @@ done
 mkdir -p $RPM_BUILD_ROOT/%{_docdir}/%{name}-%{version}
 for f in COPYING AUTHORS NEWS README Thanks Docs
 do
-	mv $RPM_BUILD_ROOT/%{_datadir}/flightgear/$f \
+	mv $RPM_BUILD_ROOT/%{_datadir}/FlightGear/$f \
 		$RPM_BUILD_ROOT/%{_docdir}/%{name}-%{version}
 done
 
@@ -65,13 +65,9 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-, root, root, 0755)
 %doc %{_docdir}/%{name}-%{version}
-%{_datadir}/flightgear
+%{_datadir}/FlightGear
 
 %changelog
-* Mon Sep 05 2011 Fabrice Bellet <fabrice at bellet.info> 2.4.0-1
-- new upstream release
-- the data directory name is now in lowercase
-
 * Wed Apr 20 2011 Tom Callaway <spot at fedoraproject.org> - 2.0.0-3
 - fix utf8 encoding on Aircraft/c172p/Models/Immat/immat.xml (default plane)
 
diff --git a/sources b/sources
index d4010db..d9adebb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fea4d52b4197bae58ce2b6a5ddbc5659  FlightGear-data-2.4.0.tar.bz2
+85009e54cfd0cf74fd66fdd97c23ccd0  FlightGear-data-2.0.0.tar.bz2


More information about the scm-commits mailing list