Hello community,

here is the log from the commit of package pgadmin3 for openSUSE:Factory
checked in at Mon Sep 26 10:10:43 CEST 2011.



--------
--- pgadmin3/pgadmin3.changes   2011-04-11 13:25:57.000000000 +0200
+++ /mounts/work_src_done/STABLE/pgadmin3/pgadmin3.changes      2011-09-16 
22:38:12.000000000 +0200
@@ -1,0 +2,6 @@
+Fri Sep 16 20:36:25 UTC 2011 - klaussfre...@gmail.com
+
+- update to upstream 1.14.0
+  * see http://www.pgadmin.org/development/changelog.php
+
+-------------------------------------------------------------------
@@ -4,0 +11,5 @@
+
+-------------------------------------------------------------------
+Mon Mar 28 15:49:37 UTC 2011 - klaussfre...@gmail.com
+
+- update to upstream git 2011-03-28

calling whatdependson for head-i586


Old:
----
  pgadmin3-1.12.1.tar.bz2
  pgadmin3-1.8.2-rpmoptflags.patch

New:
----
  pgadmin3-1.14.0.tar.gz

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ pgadmin3.spec ++++++
--- /var/tmp/diff_new_pack.DoS6vi/_old  2011-09-26 10:10:36.000000000 +0200
+++ /var/tmp/diff_new_pack.DoS6vi/_new  2011-09-26 10:10:36.000000000 +0200
@@ -22,14 +22,13 @@
 Summary:        Management and Administration Tools for the PostgreSQL Database
 License:        PostgreSQL
 Group:          Productivity/Databases/Tools
-Version:        1.12.1
-Release:        2
+Version:        1.14.0
+Release:        1
 Url:            http://www.pgadmin.org/index.php
-# 
http://ftp.de.postgresql.org/packages/databases/PostgreSQL/pgadmin3/release/v%{version}/src/pgadmin3-%{version}.tar.gz
-Source0:        pgadmin3-%{version}.tar.bz2
+# 
http://wwwmaster.postgresql.org/download/mirrors-ftp/pgadmin3/release/v{version}/src/pgadmin3-%{version}.tar.gz
+Source0:      pgadmin3-%{version}.tar.gz
 Source1:        %name.desktop
 Source2:        %name.png
-Recommends:     postgresql-server
 BuildRequires:  gcc-c++ libopenssl-devel libxml2-devel libxslt-devel 
postgresql-devel update-desktop-files
 %if 0%{?suse_version} >= 1140
 BuildRequires:  wxWidgets wxWidgets-wxcontainer-devel
@@ -39,11 +38,13 @@
 BuildRequires:  wxGTK-devel
 %endif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Patch1:         pgadmin3-1.8.2-rpmoptflags.patch
 %if 0%{?suse_version} >= 1030
 BuildRequires:  fdupes
 %endif
+%if 0%{?sles_version} != 10 && 0%{?sles_version} != 9
+Recommends:    postgresql-server
 Recommends:     %{name}-lang = %{version}
+%endif
 
 %description
 pgAdmin III is an administration and management tool for the PostgreSQL
@@ -58,21 +59,25 @@
 %lang_package
 %prep
 %setup -q
-%patch1
 
 %__sed -i 's/\r$//' LICENSE TODO CHANGELOG # remove wrong EOL
 %__sed -i 's/\r$//' docs/fr_FR/pgadmin3.{css,hhc,hhp} # remove wrong EOL
 
 %build
 
-autoreconf -fiv
+%if 0%{?suse_version} > 1010
+  autoreconf -fiv
+%else
+  autoheader
+  autoconf
+%endif
 
 export CFLAGS="%optflags -fstack-protector"
 export CXXFLAGS="%optflags -fstack-protector"
 
 %configure --with-pic --disable-static
 
-%__make %{?jobs:-j%jobs}
+%__make %{?_smp_mflags}
 
 %install
 
@@ -82,6 +87,9 @@
 # whatever that symlink is doing there...
 %__rm "%{buildroot}%{_datadir}/pgadmin3/i18n/wxstd.mo"
 
+# png2c is an internal helper... why is it installed?
+%__rm "%{buildroot}%{_bindir}/png2c"
+
 # fix permissions
 find "%{buildroot}%{_datadir}/pgadmin3/docs/" -type f -exec %__chmod 644 {} \;
 
@@ -100,7 +108,12 @@
 done
 popd #"%{buildroot}%{_datadir}/pgadmin3/docs"
 
+
+%if 0%{?sles_version} == 10 || 0%{?sles_version} == 9
+%suse_update_desktop_file %{name} System Database
+%else
 %suse_update_desktop_file -i %name System Database
+%endif
 
 %if 0%{?suse_version} >= 1030
 %fdupes -s "%{buildroot}%{_datadir}/pgadmin3"
@@ -109,7 +122,11 @@
 %clean
 %{?buildroot:%__rm -rf "%{buildroot}"}
 
+%if 0%{?sles_version} != 10 && 0%{?sles_version} != 9
 %files
+%else
+%files -f %{name}.lang
+%endif
 %defattr(-, root, root)
 %doc BUGS CHANGELOG LICENSE README TODO
 %{_bindir}/pgadmin3
@@ -119,13 +136,16 @@
 %{_datadir}/pgadmin3/i18n/pgadmin3.lng
 %{_datadir}/pgadmin3/i18n/pg_settings.csv
 %dir %{_datadir}/pgadmin3/branding
+%dir %{_datadir}/pgadmin3/plugins.d
 %config(noreplace) %{_datadir}/pgadmin3/branding/branding.ini
-%config(noreplace) %{_datadir}/pgadmin3/plugins.ini
+%config(noreplace) %{_datadir}/pgadmin3/plugins.d/plugins.ini
 %config(noreplace) %{_datadir}/pgadmin3/settings.ini
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/pixmaps/%{name}.png
 
+%if 0%{?sles_version} != 10 && 0%{?sles_version} != 9
 %files lang -f %{name}.lang
 %defattr(-, root, root)
+%endif
 
 %changelog



++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

Reply via email to