[FlightGear-Atlas] new snapshot the FlightGear data directory name is now in lowercase
Fabrice Bellet
bellet at fedoraproject.org
Tue Sep 6 12:17:00 UTC 2011
commit 2476bfd76d862afa0ded45f46659a57b3d32c6d7
Author: Fabrice Bellet <fabrice at bellet.info>
Date: Tue Sep 6 14:16:44 2011 +0200
new snapshot
the FlightGear data directory name is now in lowercase
.gitignore | 1 +
...ear-Atlas-0.4.0-fix-graph-axis-formatting.patch | 15 -------
FlightGear-Atlas-0.4.8-fix-segv.patch | 20 ----------
FlightGear-Atlas.spec | 40 ++++++++++---------
sources | 3 +-
5 files changed, 23 insertions(+), 56 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5333cf2..df86d25 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
Atlas-cvs20100719.tar.gz
Atlas-0.4.0-default-maps.tar.gz
+/atlas-0.4.8.cvs20110905.tar.gz
diff --git a/FlightGear-Atlas-0.4.8-fix-segv.patch b/FlightGear-Atlas-0.4.8-fix-segv.patch
index 0b33b10..0a7a81a 100644
--- a/FlightGear-Atlas-0.4.8-fix-segv.patch
+++ b/FlightGear-Atlas-0.4.8-fix-segv.patch
@@ -1,23 +1,3 @@
---- Atlas.orig/src/Atlas.cxx 2010-07-19 10:38:47.000000000 +0200
-+++ Atlas/src/Atlas.cxx 2010-07-20 16:50:44.000000000 +0200
-@@ -1898,7 +1898,7 @@ void MainUI::setTrackList()
- free(trackList);
- }
-
-- trackList = (char **)malloc(sizeof(char *) * globals.tracks().size() + 1);
-+ trackList = (char **)malloc(sizeof(char *)*(globals.tracks().size() + 1));
- for (unsigned int i = 0; i < globals.tracks().size(); i++) {
- // The display styles are the same as in the graphs window.
- trackList[i] = strdup(globals.track(i)->niceName());
-@@ -2797,7 +2797,7 @@ void LightingUI::updatePalettes()
- }
-
- const vector<Palette *>& p = palettes->palettes();
-- paletteList = (char **)malloc(sizeof(char *) * p.size() + 1);
-+ paletteList = (char **)malloc(sizeof(char *)*(p.size() + 1));
- for (unsigned int i = 0; i < p.size(); i++) {
- // Display the filename of the palette (but not the path).
- SGPath full(p[i]->path());
--- Atlas.orig/src/Notifications.cxx 2009-06-15 10:44:58.000000000 +0200
+++ Atlas/src/Notifications.cxx 2010-07-20 23:40:55.103800411 +0200
@@ -80,7 +80,6 @@ Subscriber::Subscriber()
diff --git a/FlightGear-Atlas.spec b/FlightGear-Atlas.spec
index 8751487..daf5817 100644
--- a/FlightGear-Atlas.spec
+++ b/FlightGear-Atlas.spec
@@ -1,15 +1,15 @@
-%define cvsdate 20100719
+%define snapshot .cvs20110905
+
Name: FlightGear-Atlas
Summary: Flightgear map tools
Version: 0.4.8
-Release: 0.2.cvs%{cvsdate}%{?dist}
+Release: 0.3%{snapshot}%{?dist}
License: GPLv2+
Group: Amusements/Games
-Source0: Atlas-cvs%{cvsdate}.tar.gz
+Source0: atlas-%{version}%{snapshot}.tar.gz
Source1: Atlas-0.4.0-default-maps.tar.gz
-Patch0: FlightGear-Atlas-0.4.0-fix-graph-axis-formatting.patch
-Patch1: FlightGear-Atlas-0.4.8-fix-segv.patch
+Patch0: FlightGear-Atlas-0.4.8-fix-segv.patch
URL: http://atlas.sourceforge.net
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: freeglut-devel, curl-devel, libpng-devel
@@ -25,35 +25,33 @@ through two main parts: The map creator (simply called Map) and the
Atlas viewer
%prep
-%setup -q -n Atlas
-%patch0 -p1 -b .axis
-%patch1 -p1 -b .segv
+%setup -q -n atlas-%{version}
+%patch0 -p1 -b .segv
find -type f -name '*.[hc]xx' -exec chmod a-x {} \;
%build
-./autogen.sh
%configure CXXFLAGS="$RPM_OPT_FLAGS -fPIC" \
- --with-fgbase=%{_datadir}/FlightGear
+ --with-fgbase=%{_datadir}/flightgear
make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_datadir}/FlightGear
-tar zxf %{SOURCE1} -C $RPM_BUILD_ROOT%{_datadir}/FlightGear
+install -d $RPM_BUILD_ROOT%{_datadir}/flightgear
+tar zxf %{SOURCE1} -C $RPM_BUILD_ROOT%{_datadir}/flightgear
# the palette file must be installed
-install -d $RPM_BUILD_ROOT%{_datadir}/FlightGear/Atlas/Palettes
-install -d $RPM_BUILD_ROOT%{_datadir}/FlightGear/Atlas/Fonts
+install -d $RPM_BUILD_ROOT%{_datadir}/flightgear/Atlas/Palettes
+install -d $RPM_BUILD_ROOT%{_datadir}/flightgear/Atlas/Fonts
install -m 0644 src/data/Fonts/*.txf \
- $RPM_BUILD_ROOT%{_datadir}/FlightGear/Atlas/Fonts
+ $RPM_BUILD_ROOT%{_datadir}/flightgear/Atlas/Fonts
install -m 0644 src/data/Palettes/*.ap \
- $RPM_BUILD_ROOT%{_datadir}/FlightGear/Atlas/Palettes
+ $RPM_BUILD_ROOT%{_datadir}/flightgear/Atlas/Palettes
install -m 0644 src/data/background.jpg \
- $RPM_BUILD_ROOT%{_datadir}/FlightGear/Atlas
+ $RPM_BUILD_ROOT%{_datadir}/flightgear/Atlas
install -m 0644 src/data/airplane_image.png \
- $RPM_BUILD_ROOT%{_datadir}/FlightGear/Atlas
+ $RPM_BUILD_ROOT%{_datadir}/flightgear/Atlas
%clean
rm -rf $RPM_BUILD_ROOT
@@ -62,9 +60,13 @@ rm -rf $RPM_BUILD_ROOT
%defattr(-, root, root, 0755)
%doc AUTHORS COPYING NEWS README
%{_bindir}/*
-%{_datadir}/FlightGear/Atlas
+%{_datadir}/flightgear/Atlas
%changelog
+* Mon Sep 05 2011 Fabrice Bellet <fabrice at bellet.info> 0.4.8-0.3
+- new snapshot
+- the FlightGear data directory name is now in lowercase
+
* Mon Feb 07 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.8-0.2.cvs20100719
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
diff --git a/sources b/sources
index 3cbd856..678135c 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-383b785062c42bdd148e97009e95dab8 Atlas-cvs20100719.tar.gz
-ad39040ecb18627f695d4a3c852db81b Atlas-0.4.0-default-maps.tar.gz
+1fe2991be88f9a5aa2d56357588db688 atlas-0.4.8.cvs20110905.tar.gz
More information about the scm-commits
mailing list