[pgadmin3] Fix -debuginfo (#746349).
Ville Skyttä
scop at fedoraproject.org
Fri May 11 15:36:24 UTC 2012
commit 5179cd42c93feb95bff2413c30a60bc4078d79ba
Author: Ville Skyttä <ville.skytta at iki.fi>
Date: Fri May 11 18:36:16 2012 +0300
Fix -debuginfo (#746349).
pgadmin3-1.10.0-optflags.patch | 26 --------------------------
pgadmin3-1.14.2-cflags.patch | 12 ++++++++++++
pgadmin3.spec | 12 +++++++-----
3 files changed, 19 insertions(+), 31 deletions(-)
---
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 at iki.fi> - 1.14.2-2
+- Fix -debuginfo (#746349).
+
* Thu May 10 2012 Devrim GUNDUZ <devrim at 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 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
More information about the scm-commits
mailing list