rpms/pgadmin3/devel pgadmin3-1.8.4-optflags.patch, NONE, 1.1 pgadmin3.spec, 1.21, 1.22

[Ville Skytta (scop)]

Author: scop

Update of /cvs/pkgs/rpms/pgadmin3/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19182

Modified Files:
	pgadmin3.spec 
Added Files:
	pgadmin3-1.8.4-optflags.patch 
Log Message:
* Mon Jul 14 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.8.4-2
- Use $RPM_OPT_FLAGS, build with dependency tracking disabled (#229054).


pgadmin3-1.8.4-optflags.patch:

--- NEW FILE pgadmin3-1.8.4-optflags.patch ---
diff -up pgadmin3-1.8.4/configure~ pgadmin3-1.8.4/configure
--- pgadmin3-1.8.4/configure~	2008-06-04 11:20:25.000000000 +0300
+++ pgadmin3-1.8.4/configure	2008-07-09 21:58:35.000000000 +0300
@@ -6932,11 +6932,6 @@ echo "${ECHO_T}ok" >&6; }
 
 
 
-	# 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/pgaevent/Makefile xtra/pgagent/Makefile xtra/wx-build/Makefile"
 
 cat >confcache <<\_ACEOF
diff -up pgadmin3-1.8.4/configure.ac~ pgadmin3-1.8.4/configure.ac
--- pgadmin3-1.8.4/configure.ac~	2008-06-04 11:20:19.000000000 +0300
+++ pgadmin3-1.8.4/configure.ac	2008-07-09 21:58:16.000000000 +0300
@@ -58,8 +58,6 @@ CHECK_LIBXML2
 LOCATE_LIBXSLT
 SETUP_LIBXSLT
 
-CLEANUP
-
 AC_CONFIG_FILES([Makefile
 		 branding/Makefile
 		 i18n/Makefile


Index: pgadmin3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pgadmin3/devel/pgadmin3.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- pgadmin3.spec	4 Jun 2008 19:18:10 -0000	1.21
+++ pgadmin3.spec	14 Jul 2008 04:26:31 -0000	1.22
@@ -1,10 +1,11 @@
 Summary:	Graphical client for PostgreSQL
 Name:		pgadmin3
 Version:	1.8.4
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	Artistic
 Group:		Applications/Databases
 Source:		ftp://ftp.postgresql.org/pub/pgadmin3/release/v%{version}/src/%{name}-%{version}.tar.gz
+Patch0:		%{name}-1.8.4-optflags.patch
 URL:		http://www.pgadmin.org/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	wxGTK-devel postgresql-devel desktop-file-utils openssl-devel libxml2-devel libxslt-devel
@@ -38,10 +39,14 @@
 
 %prep
 %setup -q
+# touch to avoid autotools re-run
+for f in configure{,.ac} ; do touch -r $f $f.stamp ; done
+%patch0 -p1
+for f in configure{,.ac} ; do touch -r $f.stamp $f ; done
 
 %build
 export LIBS="-lwx_gtk2u_core-2.8"
-%configure --disable-debug --with-wx-version=2.8 --with-wx=/usr
+%configure --disable-debug --disable-dependency-tracking --with-wx-version=2.8 --with-wx=%{_prefix}
 make %{?_smp_mflags} all
 
 %install
@@ -74,6 +79,9 @@
 %doc docs/*
 
 %changelog
+* Mon Jul 14 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.8.4-2
+- Use $RPM_OPT_FLAGS, build with dependency tracking disabled (#229054).
+
 * Wed Jun 4 2008 Devrim GUNDUZ <devrim at commandprompt.com> 1.8.4-1
 - Update to 1.8.4