rpms/rss-glx/F-12 rss-glx-0.9.1.p-autoreconf.patch, NONE, 1.1 rss-glx.spec, 1.37, 1.38

Nils Philippsen nphilipp at fedoraproject.org
Tue Jan 26 15:56:20 UTC 2010


Author: nphilipp

Update of /cvs/pkgs/rpms/rss-glx/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6054

Modified Files:
	rss-glx.spec 
Added Files:
	rss-glx-0.9.1.p-autoreconf.patch 
Log Message:
add autoreconf patch, the optflags patch isn't worth much without it (#558561)
fix changelog date


rss-glx-0.9.1.p-autoreconf.patch:
 configure |   44 ++++++++++++++++++++++++--------------------
 1 file changed, 24 insertions(+), 20 deletions(-)

--- NEW FILE rss-glx-0.9.1.p-autoreconf.patch ---
diff -up rss-glx_0.9.1.p/configure.autoreconf rss-glx_0.9.1.p/configure
--- rss-glx_0.9.1.p/configure.autoreconf	2010-01-18 12:52:02.000000000 +0100
+++ rss-glx_0.9.1.p/configure	2010-01-26 16:19:16.475525018 +0100
@@ -5362,6 +5362,7 @@ $as_echo "$as_me: error: unknown endiann
  esac
 
 
+if test "x$CFLAGS" = x; then
 if test "x$GCC" = xyes; then
 	CFLAGS="-O2"
 fi
@@ -5370,6 +5371,7 @@ if test "${enable_debug+set}" = set; the
   enableval=$enable_debug; test "$enableval" = "yes" && CFLAGS="-g"
 fi
 
+fi
 if test "x$GCC" = xyes; then
 	CFLAGS="$CFLAGS -Wall"
 fi
@@ -5874,6 +5876,7 @@ fi
 
 
 
+if test "x$CXXFLAGS" = x; then
 if test "x$GXX" = xyes; then
 	CXXFLAGS="-O2"
 fi
@@ -5882,6 +5885,7 @@ if test "${enable_debug+set}" = set; the
   enableval=$enable_debug; test "$enableval" = "yes" && CXXFLAGS="-g"
 fi
 
+fi
 if test "x$GXX" = xyes; then
 	CXXFLAGS="$CXXFLAGS -Wall"
 fi
@@ -6578,13 +6582,13 @@ if test "${lt_cv_nm_interface+set}" = se
 else
   lt_cv_nm_interface="BSD nm"
   echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:6581: $ac_compile\"" >&5)
+  (eval echo "\"\$as_me:6585: $ac_compile\"" >&5)
   (eval "$ac_compile" 2>conftest.err)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:6584: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval echo "\"\$as_me:6588: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:6587: output\"" >&5)
+  (eval echo "\"\$as_me:6591: output\"" >&5)
   cat conftest.out >&5
   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
     lt_cv_nm_interface="MS dumpbin"
@@ -7789,7 +7793,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 7792 "configure"' > conftest.$ac_ext
+  echo '#line 7796 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -9862,11 +9866,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9865: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9869: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:9869: \$? = $ac_status" >&5
+   echo "$as_me:9873: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -10201,11 +10205,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:10204: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:10208: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:10208: \$? = $ac_status" >&5
+   echo "$as_me:10212: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -10306,11 +10310,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:10309: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:10313: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:10313: \$? = $ac_status" >&5
+   echo "$as_me:10317: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -10361,11 +10365,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:10364: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:10368: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:10368: \$? = $ac_status" >&5
+   echo "$as_me:10372: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -13164,7 +13168,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 13167 "configure"
+#line 13171 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -13260,7 +13264,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 13263 "configure"
+#line 13267 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -15280,11 +15284,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15283: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15287: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:15287: \$? = $ac_status" >&5
+   echo "$as_me:15291: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -15379,11 +15383,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15382: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15386: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:15386: \$? = $ac_status" >&5
+   echo "$as_me:15390: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -15431,11 +15435,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15434: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15438: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:15438: \$? = $ac_status" >&5
+   echo "$as_me:15442: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized


Index: rss-glx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rss-glx/F-12/rss-glx.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- rss-glx.spec	18 Jan 2010 12:20:03 -0000	1.37
+++ rss-glx.spec	26 Jan 2010 15:56:20 -0000	1.38
@@ -44,7 +44,7 @@
 Summary: Really Slick Screensavers
 Name: rss-glx
 Version: 0.9.1%{patchext}
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2
 Group: Amusements/Graphics
 URL: http://rss-glx.sourceforge.net/
@@ -58,6 +58,7 @@ Source2: rss-glx-rm-matrixview.sh
 Source3: rss-glx-0.9.1-0.9.1.p.diff
 # https://sourceforge.net/tracker/?func=detail&aid=2839037&group_id=67131&atid=517003
 Patch0: rss-glx-0.9.0.p-optflags.patch
+Patch1: rss-glx-0.9.1.p-autoreconf.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: libGL-devel
 BuildRequires: libGLU-devel
@@ -170,6 +171,7 @@ Build settings:
 EOF
 %setup -q -n rss-glx_%{version}
 %patch0 -p1 -b .optflags
+%patch1 -p1 -b .autoreconf
 
 %build
 %configure \
@@ -318,7 +320,11 @@ fi
 %{kdessconfigdir}/*.desktop
 
 %changelog
-* Tue Sep 01 2009 Nils Philippsen <nils at redhat.com> 0.9.1.p-1
+* Tue Jan 26 2010 Nils Philippsen <nils at redhat.com> 0.9.1.p-2
+- add autoreconf patch, the optflags patch isn't worth much without it
+  (#558561)
+
+* Mon Jan 18 2010 Nils Philippsen <nils at redhat.com> 0.9.1.p-1
 - version 0.9.1.p
 - remove autofoo patch
 - add BR: quesoglc-devel for new pixelcity hack



More information about the scm-commits mailing list