rpms/ultimatestunts/devel ultimatestunts-0751-locale.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 ultimatestunts.spec, 1.3, 1.4
Dan Horak (sharkcz)
fedora-extras-commits at redhat.com
Mon Jun 23 12:07:08 UTC 2008
- Previous message: rpms/ghostscript/F-8 ghostscript-r8591.patch, NONE, 1.1 ghostscript.spec, 1.159, 1.160
- Next message: rpms/setup/devel .cvsignore, 1.51, 1.52 setup.spec, 1.56, 1.57 sources, 1.52, 1.53
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: sharkcz
Update of /cvs/pkgs/rpms/ultimatestunts/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25053
Modified Files:
.cvsignore sources ultimatestunts.spec
Added Files:
ultimatestunts-0751-locale.patch
Log Message:
* Mon Jun 23 2008 Dan Horak <dan[at]danny.cz> 0.7.5-1
- update to upstream version 0751
- use locale data from system directory
ultimatestunts-0751-locale.patch:
--- NEW FILE ultimatestunts-0751-locale.patch ---
--- shared/usmisc.cpp.orig 2008-06-23 13:17:32.000000000 +0200
+++ shared/usmisc.cpp 2008-06-23 13:19:16.000000000 +0200
@@ -318,12 +318,17 @@
//find the absolute path
//very long paths might cause segfaults
CString absdir = getAbsDir(DataDir);
+#if 0
+ CString localedir = absdir + "lang";
+#else
+ CString localedir = LOCALE_DIR;
+#endif
//select the Ultimate Stunts domain
//We can only use ISO 8859-1 because of the font texture
- printf(" Package %s, directory %s\n", PACKAGE, (absdir + "lang").c_str());
+ printf(" Package %s, directory %s\n", PACKAGE, localedir.c_str());
printf(" bindtextdomain returns %s\n",
- bindtextdomain(PACKAGE, (absdir + "lang").c_str())
+ bindtextdomain(PACKAGE, localedir.c_str())
);
printf(" bind_textdomain_codeset returns %s\n",
bind_textdomain_codeset(PACKAGE, "ISO-8859-1")
--- shared/Makefile.am.orig 2008-06-23 13:15:08.000000000 +0200
+++ shared/Makefile.am 2008-06-23 13:46:21.000000000 +0200
@@ -2,6 +2,7 @@
libshared_a_SOURCES = binbuffer.cpp bthread.cpp cfile.cpp cstring.cpp datafile.cpp datamanager.cpp dataobject.cpp generalmatrix.cpp generalvector.cpp glbfile.cpp hello.cpp ipnumber.cpp lconfig.cpp matrix.cpp timer.cpp usmisc.cpp vector.cpp
INCLUDES = -I$(top_srcdir)/intl $(all_includes)
+AM_CXXFLAGS = -DLOCALE_DIR=\"$(datadir)/locale\"
EXTRA_DIST = binbuffer.cpp binbuffer.h bthread.cpp bthread.h cfile.cpp cfile.h cstring.cpp cstring.h datafile.cpp datafile.h datamanager.cpp datamanager.h dataobject.cpp dataobject.h filecontrol.h generalmatrix.cpp generalmatrix.h generalvector.cpp generalvector.h glbfile.cpp glbfile.h hello.cpp hello.h lconfig.cpp lconfig.h matrix.cpp matrix.h pi.h timer.cpp timer.h usmisc.cpp usmisc.h vector.cpp vector.h
--- shared/Makefile.in.orig 2008-06-23 13:15:08.000000000 +0200
+++ shared/Makefile.in 2008-06-23 13:49:18.000000000 +0200
@@ -230,6 +230,7 @@
noinst_LIBRARIES = libshared.a
libshared_a_SOURCES = binbuffer.cpp bthread.cpp cfile.cpp cstring.cpp datafile.cpp datamanager.cpp dataobject.cpp generalmatrix.cpp generalvector.cpp glbfile.cpp hello.cpp ipnumber.cpp lconfig.cpp matrix.cpp timer.cpp usmisc.cpp vector.cpp
INCLUDES = -I$(top_srcdir)/intl $(all_includes)
+AM_CXXFLAGS = -DLOCALE_DIR=\"$(datadir)/locale\"
EXTRA_DIST = binbuffer.cpp binbuffer.h bthread.cpp bthread.h cfile.cpp cfile.h cstring.cpp cstring.h datafile.cpp datafile.h datamanager.cpp datamanager.h dataobject.cpp dataobject.h filecontrol.h generalmatrix.cpp generalmatrix.h generalvector.cpp generalvector.h glbfile.cpp glbfile.h hello.cpp hello.h lconfig.cpp lconfig.h matrix.cpp matrix.h pi.h timer.cpp timer.h usmisc.cpp usmisc.h vector.cpp vector.h
all: all-am
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ultimatestunts/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 10 Feb 2008 12:21:11 -0000 1.3
+++ .cvsignore 23 Jun 2008 12:06:22 -0000 1.4
@@ -1 +1 @@
-ultimatestunts-srcdata-0741.tar.gz
+ultimatestunts-srcdata-0751.tar.gz
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ultimatestunts/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 10 Feb 2008 12:21:11 -0000 1.3
+++ sources 23 Jun 2008 12:06:22 -0000 1.4
@@ -1 +1 @@
-bbc9c25c599b76e1f3c1d8f8a3e5f820 ultimatestunts-srcdata-0741.tar.gz
+e216bbbfc3d2a868be7e647aa79c6bca ultimatestunts-srcdata-0751.tar.gz
Index: ultimatestunts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ultimatestunts/devel/ultimatestunts.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ultimatestunts.spec 10 Feb 2008 12:21:11 -0000 1.3
+++ ultimatestunts.spec 23 Jun 2008 12:06:22 -0000 1.4
@@ -1,7 +1,7 @@
-%define ver 0741
+%define ver 0751
Name: ultimatestunts
-Version: 0.7.4
+Version: 0.7.5
Release: 1%{?dist}
Summary: UltimateStunts is a remake of the famous DOS-game Stunts
@@ -11,6 +11,7 @@
Source0: http://downloads.sf.net/%{name}/%{name}-srcdata-%{ver}.tar.gz
Source1: %{name}.desktop
Patch0: ultimatestunts-0721-make.patch
+Patch1: ultimatestunts-0751-locale.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: dos2unix freealut-devel SDL_image-devel freeglut-devel libXi-devel
@@ -31,6 +32,7 @@
%prep
%setup -q -n %{name}-srcdata-%{ver}
%patch0
+%patch1
# remove CVS control files
find . -name CVS -type d -print0 | xargs -0 rm -rf
@@ -76,6 +78,8 @@
usdatadir=$RPM_BUILD_ROOT%{_datadir}/%{name} \
localedir=%{_datadir}/locale
+rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/lang
+
%find_lang %{name}
desktop-file-install --vendor fedora \
@@ -97,6 +101,10 @@
%changelog
+* Mon Jun 23 2008 Dan Horak <dan[at]danny.cz> 0.7.5-1
+- update to upstream version 0751
+- use locale data from system directory
+
* Wed Jan 30 2008 Dan Horak <dan[at]danny.cz> 0.7.4-1
- update to upstream version 0741
- remove integrated patches
- Previous message: rpms/ghostscript/F-8 ghostscript-r8591.patch, NONE, 1.1 ghostscript.spec, 1.159, 1.160
- Next message: rpms/setup/devel .cvsignore, 1.51, 1.52 setup.spec, 1.56, 1.57 sources, 1.52, 1.53
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list