SPECS (DEVEL): opencity.spec - up to 0.0.5beta - fix as-needed (ne...

[lisu]

Author: lisu                         Date: Sat Dec  8 15:58:55 2007 GMT
Module: SPECS                         Tag: DEVEL
---- Log message:
- up to 0.0.5beta
- fix as-needed (new patch, some trouble with linking)
- man pages and configs added

---- Files affected:
SPECS:
   opencity.spec (1.3 -> 1.3.2.1) 

---- Diffs:

================================================================
Index: SPECS/opencity.spec
diff -u SPECS/opencity.spec:1.3 SPECS/opencity.spec:1.3.2.1
--- SPECS/opencity.spec:1.3	Mon Feb 12 23:09:10 2007
+++ SPECS/opencity.spec	Sat Dec  8 16:58:50 2007
@@ -3,17 +3,19 @@
 # Conditional build:
 %bcond_without	SDL_mixer	# build without SDL_mixer
 #
+%define _beta	beta
 Summary:	A 3D city simulator
 Summary(pl.UTF-8):	TrĂłjwymiarowy symulator miasta
 Name:		opencity
-Version:	0.0.4
-Release:	1
+Version:	0.0.5
+Release:	0.%{_beta}.1
 License:	GPL v2+
 Group:		X11/Applications/Games
-Source0:	http://dl.sourceforge.net/opencity/%{name}-%{version}stable.tar.bz2
-# Source0-md5:	9ae00d6d380265d48f59fb7da8d75dcd
+Source0:	http://dl.sourceforge.net/opencity/%{name}-%{version}%{_beta}.tar.bz2
+# Source0-md5:	4b4aacda8ecdca744a85e4c0572b609a
 Patch0:		%{name}-config_dir.patch
 Patch1:		%{name}-desktop.patch
+Patch2:		%{name}-as-needed.patch
 URL:		http://www.opencity.info/
 BuildRequires:	OpenGL-GLU-devel
 BuildRequires:	SDL-devel
@@ -35,27 +37,31 @@
 Ĺźadnego z popularnych symulatorĂłw miast firmy Max*s.
 
 %prep
-%setup -q -n %{name}-%{version}stable
+%setup -q -n %{name}-%{version}%{_beta}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %{__aclocal}
 %{__autoconf}
 %{__autoheader}
 %{__automake}
-%configure
+%configure \
+	%{?without_SDL_mixer: --disable-sdl-mixer} \
+	LIBS="%{?with_SDL_mixer: -lSDL_mixer} -lpng -lSDL_net -lSDL_image -lGLU -lGL `sdl-config --libs`"
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir}}
+install -d $RPM_BUILD_ROOT{%{_datadir}/%{name}/config,%{_desktopdir},%{_pixmapsdir}}
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-install OpenCity.desktop $RPM_BUILD_ROOT%{_desktopdir}/%{name}.desktop
-install OpenCity.png $RPM_BUILD_ROOT%{_pixmapsdir}/%{name}.png
+install config/{*.conf,*.xml} $RPM_BUILD_ROOT%{_datadir}/%{name}/config
+install opencity.desktop $RPM_BUILD_ROOT%{_desktopdir}
+install opencity.png $RPM_BUILD_ROOT%{_pixmapsdir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -66,6 +72,7 @@
 %attr(755,root,root) %{_bindir}/*
 %{_datadir}/%{name}
 %{_desktopdir}/%{name}.desktop
+%{_mandir}/man6/*
 %{_pixmapsdir}/%{name}.png
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -74,6 +81,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.3.2.1  2007-12-08 15:58:50  lisu
+- up to 0.0.5beta
+- fix as-needed (new patch, some trouble with linking)
+- man pages and configs added
+
 Revision 1.3  2007-02-12 22:09:10  glen
 - tabs in preamble
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/opencity.spec?r1=1.3&r2=1.3.2.1&f=u