rpms/rss-glx/devel rss-glx-0.8.1-flags.patch, NONE, 1.1 rss-glx.spec, 1.2, 1.3
Nils Philippsen (nphilipp)
fedora-extras-commits at redhat.com
Fri Jun 2 10:32:50 UTC 2006
Author: nphilipp
Update of /cvs/extras/rpms/rss-glx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17909
Modified Files:
rss-glx.spec
Added Files:
rss-glx-0.8.1-flags.patch
Log Message:
replace symlinked source files with copies to work around #189928
honour RPM optflags
rss-glx-0.8.1-flags.patch:
--- NEW FILE rss-glx-0.8.1-flags.patch ---
--- rss-glx_0.8.1.p/configure.in.flags 2006-06-02 11:38:10.000000000 +0200
+++ rss-glx_0.8.1.p/configure.in 2006-06-02 12:29:35.000000000 +0200
@@ -7,17 +7,27 @@
AC_PROG_AWK
AC_PROG_CC
-CFLAGS=-g
AC_ARG_ENABLE([debug], [AC_HELP_STRING([--enable-debug],
[build with debugging information default=yes])],
- [test "$enableval" = "no" && CFLAGS="-O2"])
+ [
+ if test "$enableval" = "no"; then
+ : ${CFLAGS="-O2"}
+ else
+ : ${CFLAGS="-g"}
+ fi
+ ])
CFLAGS="$CFLAGS -Wall"
AC_PROG_CXX
-CXXFLAGS=-g
AC_ARG_ENABLE([debug], [AC_HELP_STRING([--enable-debug],
[build with debugging information default=yes])],
- [test "$enableval" = "no" && CXXFLAGS="-O2"])
+ [
+ if test "$enableval" = "no"; then
+ : ${CXXFLAGS="-O2"}
+ else
+ : ${CXXFLAGS="-g"}
+ fi
+ ])
CXXFLAGS="$CXXFLAGS -Wall"
AC_PROG_INSTALL
Index: rss-glx.spec
===================================================================
RCS file: /cvs/extras/rpms/rss-glx/devel/rss-glx.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- rss-glx.spec 29 May 2006 13:22:20 -0000 1.2
+++ rss-glx.spec 2 Jun 2006 10:32:49 -0000 1.3
@@ -32,6 +32,7 @@
Source2: rss-glx-rm-matrixview.sh
Source3: rss-glx-0.8.1-0.8.1.p.diff
Patch0: rss-glx-0.8.1-freealut.patch
+Patch1: rss-glx-0.8.1-flags.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires: libGL-devel
BuildRequires: libGLU-devel
@@ -121,6 +122,14 @@
EOF
%setup -q -n rss-glx_%{version}
%patch0 -p1 -b .freealut
+%patch1 -p1 -b .flags
+
+# work around BZ #189928
+for f in `find . -type l` ; do
+ cp -p ${f} ${f}_
+ unlink ${f}
+ mv ${f}_ $f
+done
%build
autoconf
@@ -228,6 +237,10 @@
%{kdessconfigdir}/*.desktop
%changelog
+* Fri Jun 02 2006 Nils Philippsen <nphilipp at redhat.com> 0.8.1.p-2
+- replace symlinked source files with copies to work around #189928
+- honour RPM optflags
+
* Mon May 29 2006 Nils Philippsen <nphilipp at redhat.com> 0.8.1.p-1
- bump release
More information about the fedora-extras-commits
mailing list