packages: opencity/opencity-as-needed.patch, opencity/opencity.spec - up to...

[lisu]

Author: lisu                         Date: Tue Dec 14 10:36:11 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 0.0.6.3
- more TODO

---- Files affected:
packages/opencity:
   opencity-as-needed.patch (1.3 -> 1.4) , opencity.spec (1.11 -> 1.12) 

---- Diffs:

================================================================
Index: packages/opencity/opencity-as-needed.patch
diff -u packages/opencity/opencity-as-needed.patch:1.3 packages/opencity/opencity-as-needed.patch:1.4
--- packages/opencity/opencity-as-needed.patch:1.3	Thu Nov 19 09:19:31 2009
+++ packages/opencity/opencity-as-needed.patch	Tue Dec 14 11:36:05 2010
@@ -5,16 +5,7 @@
  
  CXXFLAGS="$SDL_CFLAGS"
 -LDFLAGS="$LDFLAGS $SDL_LIBS"
-+LDIBS="$LIBS $SDL_LIBS"
++LIBS="$LIBS $SDL_LIBS -lSDL_mixer -lpng"
  
  AC_PROG_CXX
  AC_LANG_CPLUSPLUS
-@@ -70,7 +70,7 @@
- 
-         if test "x$SDL_mixer_h" = "xyes"; then
-                 if test "x$SDL_mixer_lib" = "xyes"; then
--                        LDFLAGS="$LDFLAGS -lSDL_mixer"
-+                        LIBS="$LIBS -lSDL_mixer -lpng"
-                         AC_DEFINE(OPENCITY_SDL_MIXER, 1, [SDL_Mixer support])
-                         AC_MSG_RESULT(yes)
-                 else

================================================================
Index: packages/opencity/opencity.spec
diff -u packages/opencity/opencity.spec:1.11 packages/opencity/opencity.spec:1.12
--- packages/opencity/opencity.spec:1.11	Mon Dec 21 14:44:16 2009
+++ packages/opencity/opencity.spec	Tue Dec 14 11:36:05 2010
@@ -5,6 +5,7 @@
 #    /etc/opencity/config/graphism.conf
 #    /etc/opencity/config/graphism.xml
 #    /etc/opencity/config/opencity.xml
+# - pass rpm*flags
 #
 # Conditional build:
 %bcond_without	SDL_mixer	# build without SDL_mixer
@@ -13,18 +14,18 @@
 Summary(hu.UTF-8):	3D-s városépítő szimulátor
 Summary(pl.UTF-8):	Trójwymiarowy symulator miasta
 Name:		opencity
-Version:	0.0.6.2
+Version:	0.0.6.3
 Release:	1
 License:	GPL v2+
 Group:		X11/Applications/Games
-Source0:	http://dl.sourceforge.net/opencity/%{name}-%{version}stable.tar.bz2
-# Source0-md5:	f7dcf6b98ee2893c44720f199c5bb384
+Source0:	http://downloads.sourceforge.net/opencity/%{name}-%{version}stable.tar.bz2
+# Source0-md5:	d42d592019c27b9e10dbba51846826f1
 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 >= 1.2.9
+BuildRequires:	SDL-devel >= 1.2.12
 BuildRequires:	SDL_image-devel
 %{?with_SDL_mixer:BuildRequires:	SDL_mixer-devel}
 BuildRequires:	SDL_net-devel
@@ -72,9 +73,9 @@
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-install config/{*.conf,*.xml} $RPM_BUILD_ROOT%{_datadir}/%{name}/config
-install opencity.desktop $RPM_BUILD_ROOT%{_desktopdir}
-install opencity.png $RPM_BUILD_ROOT%{_pixmapsdir}
+cp -a config/{*.conf,*.xml} $RPM_BUILD_ROOT%{_datadir}/%{name}/config
+cp -a opencity.desktop $RPM_BUILD_ROOT%{_desktopdir}
+cp -a opencity.png $RPM_BUILD_ROOT%{_pixmapsdir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -94,6 +95,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.12  2010/12/14 10:36:05  lisu
+- up to 0.0.6.3
+- more TODO
+
 Revision 1.11  2009/12/21 13:44:16  uzsolt
 - hungarizing
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/opencity/opencity-as-needed.patch?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/opencity/opencity.spec?r1=1.11&r2=1.12&f=u