[FlightGear] retab
Fabrice Bellet
bellet at fedoraproject.org
Tue Sep 11 18:50:53 UTC 2012
commit 33c66af18d0aa01d3aaa6a34aa546141f498fdf2
Author: Fabrice Bellet <fabrice at bellet.info>
Date: Tue Sep 11 20:34:16 2012 +0200
retab
FlightGear.spec | 82 +++++++++++++++++++++++++++---------------------------
1 files changed, 41 insertions(+), 41 deletions(-)
---
diff --git a/FlightGear.spec b/FlightGear.spec
index f05d895..5e7f93d 100644
--- a/FlightGear.spec
+++ b/FlightGear.spec
@@ -1,31 +1,31 @@
-Name: FlightGear
-Summary: The FlightGear Flight Simulator
-Version: 2.6.0
-Release: 3%{?dist}
-License: GPLv2+
-Group: Amusements/Games
-Source: http://mirrors.ibiblio.org/pub/mirrors/flightgear/ftp/Source/flightgear-%{version}.tar.bz2
-Source1: %{name}.desktop
+Name: FlightGear
+Summary: The FlightGear Flight Simulator
+Version: 2.6.0
+Release: 3%{?dist}
+License: GPLv2+
+Group: Amusements/Games
+Source: http://mirrors.ibiblio.org/pub/mirrors/flightgear/ftp/Source/flightgear-%{version}.tar.bz2
+Source1: %{name}.desktop
# these icons were previously available from
# http://jrbabcock.home.comcast.net/flightgear/icons
-Source2: fg-16.png
-Source3: fg-32.png
-Source4: fg-48.png
-Source5: fg-64.png
-Source6: fg-128.png
-Source7: COPYING
-Patch1: 0001-add-zlib-dependency-to-fgadmin.patch
-Patch2: 0002-fix-build-with-gcc-4.7.0.patch
-Patch3: flightgear-2.6.0-check-for-%n-in-printf-format-string.patch
-Patch4: flightgear-2.6.0-use-snprintf-for-rotor-strings.patch
-URL: http://www.flightgear.org/
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: openal-soft-devel >= 1.11.753, SimGear-devel >= %{version}
-BuildRequires: libpng-devel, freeglut-devel, libXi-devel, libXmu-devel
-BuildRequires: OpenSceneGraph-devel >= 2.8.0, boost-devel >= 1.37.0
-BuildRequires: desktop-file-utils, apr-devel, subversion-devel
-Requires: FlightGear-data >= 2.4.0, opengl-games-utils
-Requires: hicolor-icon-theme
+Source2: fg-16.png
+Source3: fg-32.png
+Source4: fg-48.png
+Source5: fg-64.png
+Source6: fg-128.png
+Source7: COPYING
+Patch1: 0001-add-zlib-dependency-to-fgadmin.patch
+Patch2: 0002-fix-build-with-gcc-4.7.0.patch
+Patch3: flightgear-2.6.0-check-for-%n-in-printf-format-string.patch
+Patch4: flightgear-2.6.0-use-snprintf-for-rotor-strings.patch
+URL: http://www.flightgear.org/
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires: openal-soft-devel >= 1.11.753, SimGear-devel >= %{version}
+BuildRequires: libpng-devel, freeglut-devel, libXi-devel, libXmu-devel
+BuildRequires: OpenSceneGraph-devel >= 2.8.0, boost-devel >= 1.37.0
+BuildRequires: desktop-file-utils, apr-devel, subversion-devel
+Requires: FlightGear-data >= 2.4.0, opengl-games-utils
+Requires: hicolor-icon-theme
%description
The Flight Gear project is working to create a sophisticated flight
@@ -42,18 +42,18 @@ expanded and improved upon by anyone interested in contributing
# make rpmlint happy
find -name \*.h -o -name \*.cpp -o -name \*.cxx -o -name \*.hxx \
- -o -name \*.hpp |xargs chmod -x
+ -o -name \*.hpp |xargs chmod -x
for f in docs-mini/README.xmlparticles Thanks
do
- iconv -f iso-8859-1 -t utf-8 -o ${f}.utf8 ${f}
- mv -f ${f}.utf8 ${f}
+ iconv -f iso-8859-1 -t utf-8 -o ${f}.utf8 ${f}
+ mv -f ${f}.utf8 ${f}
done
sed -i 's/\r//' docs-mini/AptNavFAQ.FlightGear.html
# remove some unneeded files for the doc section
for ext in Cygwin IRIX Joystick Linux MSVC MSVC8 MacOS SimGear Unix \
- Win32-X autoconf mingw plib src xmlsyntax
+ Win32-X autoconf mingw plib src xmlsyntax
do
- rm -f docs-mini/README.${ext}
+ rm -f docs-mini/README.${ext}
done
# icons license file
cp %{SOURCE7} COPYING.icons
@@ -72,9 +72,9 @@ rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install
ln -s opengl-game-wrapper.sh $RPM_BUILD_ROOT%{_bindir}/fgfs-wrapper
-desktop-file-install --vendor="fedora" \
- --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
- %{SOURCE1}
+desktop-file-install --vendor="fedora" \
+ --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
+ %{SOURCE1}
# install icons
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps
@@ -84,15 +84,15 @@ mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/64x64/apps
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/128x128/apps
install -m 0644 %{SOURCE2} \
- $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps/%{name}.png
+ $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps/%{name}.png
install -m 0644 %{SOURCE3} \
- $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
+ $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
install -m 0644 %{SOURCE4} \
- $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
+ $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
install -m 0644 %{SOURCE5} \
- $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/64x64/apps/%{name}.png
+ $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/64x64/apps/%{name}.png
install -m 0644 %{SOURCE6} \
- $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/128x128/apps/%{name}.png
+ $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/128x128/apps/%{name}.png
%post
update-desktop-database &> /dev/null ||:
@@ -101,8 +101,8 @@ touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
%postun
update-desktop-database &> /dev/null ||:
if [ $1 -eq 0 ] ; then
- touch --no-create %{_datadir}/icons/hicolor &>/dev/null
- gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+ touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi
%posttrans
More information about the scm-commits
mailing list