[pgadmin3/f17] - Update licence, per bz #871183. - Update to 1.16.0 - Fix -debuginfo, per bz #746349.

Devrim GÜNDÜZ devrim at fedoraproject.org
Mon Oct 29 20:59:48 UTC 2012


commit 8b59b18e9a0be46872b1f25e70645ddaab020cac
Author: Devrim GUNDUZ <devrim at gunduz.org>
Date:   Mon Oct 29 22:59:36 2012 +0200

    - Update licence, per bz #871183.
    - Update to 1.16.0
    - Fix -debuginfo, per bz #746349.

 pgadmin3-1.14.2-cflags.patch |   12 ++++++++++++
 pgadmin3.spec                |   13 ++++++++++---
 2 files changed, 22 insertions(+), 3 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 bf9d56c..5ff97c9 100644
--- a/pgadmin3.spec
+++ b/pgadmin3.spec
@@ -1,11 +1,12 @@
 Summary:	Graphical client for PostgreSQL
 Name:		pgadmin3
-Version:	1.14.0
-Release:	2%{?dist}
-License:	BSD
+Version:	1.16.0
+Release:	1%{?dist}
+License:	PostgreSQL
 Group:		Applications/Databases
 Source:		ftp://ftp.postgresql.org/pub/pgadmin3/release/v%{version}/src/%{name}-%{version}.tar.gz
 Patch2:		%{name}-desktop.patch
+Patch3:		%{name}-1.14.2-cflags.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
@@ -33,6 +34,7 @@ required to communicate with the database server.
 # touch to avoid autotools re-run
 for f in configure{,.ac} ; do touch -r $f $f.stamp ; done
 %patch2 -p0
+%patch3 -p1
 for f in configure{,.ac} ; do touch -r $f.stamp $f ; done
 
 %build
@@ -82,6 +84,11 @@ rm -rf %{buildroot}
 %{_datadir}/applications/*
 
 %changelog
+* Mon Oct 29 2012 Devrim GUNDUZ <devrim at gunduz.org> 1.16.0-1
+- Update licence, per bz #871183.
+- Update to 1.16.0
+- Fix -debuginfo, per bz #746349.
+
 * Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.14.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 


More information about the scm-commits mailing list