From 5179cd42c93feb95bff2413c30a60bc4078d79ba Mon Sep 17 00:00:00 2001
From: Ville Skyttä <ville.skytta@iki.fi>
Date: May 11 2012 15:36:16 +0000
Subject: Fix -debuginfo (#746349).


---

diff --git a/pgadmin3-1.10.0-optflags.patch b/pgadmin3-1.10.0-optflags.patch
deleted file mode 100644
index 5c72b37..0000000
--- a/pgadmin3-1.10.0-optflags.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- pgadmin3-1.10.0-beta1/configure.old	2009-03-13 18:34:51.000000000 +0200
-+++ pgadmin3-1.10.0-beta1/configure	2009-03-13 18:35:41.000000000 +0200
-@@ -7470,12 +7470,6 @@
- 	fi
- 
- 
--
--	# CFLAGS/CXXFLAGS may well contain unwanted settings, so clear them.
--	CFLAGS=""
--	CXXFLAGS=""
--
--
- ac_config_files="$ac_config_files Makefile branding/Makefile i18n/Makefile pgadmin/Makefile pkg/Makefile pkg/debian/Makefile pkg/mac/Makefile pkg/mandrake/Makefile pkg/redhat/Makefile pkg/slackware/Makefile pkg/src/Makefile pkg/suse/Makefile pkg/win32/Makefile xtra/Makefile xtra/pgscript/Makefile xtra/pgscript/lib/Makefile xtra/pgscript/bin/Makefile xtra/pgscript/test/Makefile xtra/wx-build/Makefile"
- 
- cat >confcache <<\_ACEOF
---- pgadmin3-1.10.0-beta1/configure.ac.old	2009-03-13 18:34:57.000000000 +0200
-+++ pgadmin3-1.10.0-beta1/configure.ac	2009-03-13 18:35:06.000000000 +0200
-@@ -59,8 +59,6 @@
- LOCATE_LIBXSLT
- SETUP_LIBXSLT
- 
--CLEANUP
--
- AC_CONFIG_FILES([Makefile
- 		 branding/Makefile
- 		 i18n/Makefile
diff --git a/pgadmin3-1.14.2-cflags.patch b/pgadmin3-1.14.2-cflags.patch
new file mode 100644
index 0000000..148b1bb
--- /dev/null
+++ b/pgadmin3-1.14.2-cflags.patch
@@ -0,0 +1,12 @@
+diff -up pgadmin3-1.14.2/configure~ pgadmin3-1.14.2/configure
+--- pgadmin3-1.14.2/configure~	2012-02-23 16:44:56.000000000 +0200
++++ pgadmin3-1.14.2/configure	2012-05-11 17:17:00.629748769 +0300
+@@ -6229,8 +6229,6 @@ $as_echo "ok" >&6; }
+ 		else
+ 			WX_NEW_CPPFLAGS=`${WX_CONFIG} --cppflags --unicode=yes --debug=no --version=${WX_VERSION} 2> /dev/null`
+ 			CPPFLAGS="$CPPFLAGS $WX_NEW_CPPFLAGS -DEMBED_XRC"
+-			CFLAGS=`echo $CFLAGS | sed -e "s/-g //g"`
+-			CXXFLAGS=`echo $CXXFLAGS | sed -e "s/-g //g"`
+ 
+ 			pgadmin3_LDADD=`${WX_CONFIG} ${WX_STATIC} --libs std,stc,aui --unicode=yes --debug=no --version=${WX_VERSION} 2> /dev/null`
+ 			pgsTest_LDADD=`${WX_CONFIG} ${WX_STATIC} --libs base,core,xml --unicode=yes --debug=no --version=${WX_VERSION} 2> /dev/null`
diff --git a/pgadmin3.spec b/pgadmin3.spec
index 790fa52..008d566 100644
--- a/pgadmin3.spec
+++ b/pgadmin3.spec
@@ -1,10 +1,11 @@
 Summary:	Graphical client for PostgreSQL
 Name:		pgadmin3
 Version:	1.14.2
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	BSD
 Group:		Applications/Databases
 Source:		ftp://ftp.postgresql.org/pub/pgadmin3/release/v%{version}/src/%{name}-%{version}.tar.gz
+Patch0:		%{name}-1.14.2-cflags.patch
 Patch2:		%{name}-desktop.patch
 URL:		http://www.pgadmin.org/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -30,10 +31,8 @@ required to communicate with the database server.
 
 %prep
 %setup -q
-# touch to avoid autotools re-run
-for f in configure{,.ac} ; do touch -r $f $f.stamp ; done
+%patch0 -p1
 %patch2 -p0
-for f in configure{,.ac} ; do touch -r $f.stamp $f ; done
 
 %build
 export LIBS="-lwx_gtk2u_core-2.8"
@@ -82,6 +81,9 @@ rm -rf %{buildroot}
 %{_datadir}/applications/*
 
 %changelog
+* Fri May 11 2012 Ville Skyttä <ville.skytta@iki.fi> - 1.14.2-2
+- Fix -debuginfo (#746349).
+
 * Thu May 10 2012 Devrim GUNDUZ <devrim@gunduz.org> 1.14.2-1
 - Update to 1.14.2
 
@@ -133,7 +135,7 @@ rm -rf %{buildroot}
   Removed useless -docs package, main package shipped it anyway
   Many spec file and package cleanups to get rpmlint very silent
 
-* Mon Jul 14 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.8.4-2
+* Mon Jul 14 2008 Ville Skyttä <ville.skytta@iki.fi> - 1.8.4-2
 - Use $RPM_OPT_FLAGS, build with dependency tracking disabled (#229054).
 
 * Wed Jun 4 2008 Devrim GUNDUZ <devrim@commandprompt.com> 1.8.4-1