rpms/wormux/devel wormux-0.7.9-cflags.patch, NONE, 1.1 wormux.spec, 1.8, 1.9
Michael Thomas (wart)
fedora-extras-commits at redhat.com
Wed Mar 28 22:30:33 UTC 2007
Author: wart
Update of /cvs/extras/rpms/wormux/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2631
Modified Files:
wormux.spec
Added Files:
wormux-0.7.9-cflags.patch
Log Message:
Enable use of RPM_OPT_FLAGS
wormux-0.7.9-cflags.patch:
--- NEW FILE wormux-0.7.9-cflags.patch ---
--- wormux-0.7.9/configure.ac~ 2007-01-28 16:06:11.000000000 +0200
+++ wormux-0.7.9/configure.ac 2007-03-24 12:59:34.000000000 +0200
@@ -150,11 +150,8 @@
GCC_FLAGS="$GCC_FLAGS -O2"
fi
- dnl Ignore default options set by autoconf
- dnl CFLAGS="$CFLAGS $GCC_FLAGS"
- CFLAGS="$GCC_FLAGS"
- dnl CXXFLAGS="$CXXFLAGS $GCC_FLAGS"
- CXXFLAGS="$GCC_FLAGS"
+ CFLAGS="$GCC_FLAGS $CFLAGS"
+ CXXFLAGS="$GCC_FLAGS $CXXFLAGS"
else
if test "x${debug}" = "xyes"; then
--- wormux-0.7.9/configure~ 2007-01-28 16:06:58.000000000 +0200
+++ wormux-0.7.9/configure 2007-03-24 12:59:57.000000000 +0200
@@ -7319,8 +7319,8 @@
GCC_FLAGS="$GCC_FLAGS -O2"
fi
- CFLAGS="$GCC_FLAGS"
- CXXFLAGS="$GCC_FLAGS"
+ CFLAGS="$GCC_FLAGS $CFLAGS"
+ CXXFLAGS="$GCC_FLAGS $CXXFLAGS"
else
if test "x${debug}" = "xyes"; then
--- wormux-0.7.9/src/Makefile.am~ 2007-01-28 16:03:48.000000000 +0200
+++ wormux-0.7.9/src/Makefile.am 2007-03-24 13:03:12.000000000 +0200
@@ -176,7 +176,7 @@
weapon/blowtorch.cpp weapon/blowtorch.h \
weapon/syringe.cpp weapon/syringe.h
-AM_CXXFLAGS = -DINSTALL_DATADIR=\"$(pkgdatadir)\" -DINSTALL_LOCALEDIR=\"$(localedir)\" -DFONT_FILE=\"$(fontfile)\" -DPACKAGE_VERSION=\"$(PACKAGE_VERSION)\" -Werror
+AM_CXXFLAGS = -DINSTALL_DATADIR=\"$(pkgdatadir)\" -DINSTALL_LOCALEDIR=\"$(localedir)\" -DFONT_FILE=\"$(fontfile)\" -DPACKAGE_VERSION=\"$(PACKAGE_VERSION)\"
if WIN32
--- wormux-0.7.9/src/Makefile.in~ 2007-01-28 16:06:57.000000000 +0200
+++ wormux-0.7.9/src/Makefile.in 2007-03-24 13:03:28.000000000 +0200
@@ -518,7 +518,7 @@
weapon/submachine_gun.h weapon/polecat.cpp weapon/polecat.h \
weapon/blowtorch.cpp weapon/blowtorch.h weapon/syringe.cpp \
weapon/syringe.h $(am__append_1)
-AM_CXXFLAGS = -DINSTALL_DATADIR=\"$(pkgdatadir)\" -DINSTALL_LOCALEDIR=\"$(localedir)\" -DFONT_FILE=\"$(fontfile)\" -DPACKAGE_VERSION=\"$(PACKAGE_VERSION)\" -Werror
+AM_CXXFLAGS = -DINSTALL_DATADIR=\"$(pkgdatadir)\" -DINSTALL_LOCALEDIR=\"$(localedir)\" -DFONT_FILE=\"$(fontfile)\" -DPACKAGE_VERSION=\"$(PACKAGE_VERSION)\"
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive
Index: wormux.spec
===================================================================
RCS file: /cvs/extras/rpms/wormux/devel/wormux.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- wormux.spec 10 Mar 2007 05:32:26 -0000 1.8
+++ wormux.spec 28 Mar 2007 22:30:00 -0000 1.9
@@ -1,12 +1,13 @@
Name: wormux
Version: 0.7.9
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: 2D convivial mass murder game
Group: Amusements/Games
License: GPL
URL: http://www.wormux.org
Source0: http://download.gna.org/wormux/%{name}-%{version}.tar.gz
+Patch0: wormux-0.7.9-cflags.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: SDL_image-devel SDL_gfx-devel SDL_mixer-devel
@@ -30,10 +31,11 @@
%prep
%setup -q
+%patch0 -p1
%build
-%configure --disable-nls
+%configure --disable-nls --disable-dependency-tracking
make %{?_smp_mflags}
@@ -83,6 +85,9 @@
%{_datadir}/%{name}
%changelog
+* Wed Mar 28 2007 Wart <wart at kobold.org> 0.7.9-3
+- Enable use of $RPM_OPT_FLAGS
+
* Fri Mar 9 2007 Wart <wart at kobold.org> 0.7.9-2
- Clean up desktop file categories
- Use upstream's desktop file and icon
More information about the fedora-extras-commits
mailing list