Hello community, here is the log from the commit of package pgadmin3 for openSUSE:Factory checked in at 2017-02-02 15:42:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pgadmin3 (Old) and /work/SRC/openSUSE:Factory/.pgadmin3.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pgadmin3" Changes: -------- --- /work/SRC/openSUSE:Factory/pgadmin3/pgadmin3.changes 2017-01-12 15:58:37.019924385 +0100 +++ /work/SRC/openSUSE:Factory/.pgadmin3.new/pgadmin3.changes 2017-02-03 18:55:20.362879618 +0100 @@ -1,0 +2,14 @@ +Sun Jan 29 16:21:02 UTC 2017 - [email protected] + +- Packaging : + + spec-clean minimal + + remove obsolete version sle and openSUSE + + globalize \r removal in css files + + use wxWidgets-3_0-nostl-devel to remove dependency of gst 0.10 + so use internal dependency generator on openSUSE > 1315 + + Add WX_VER variable to build correctly + + Added patch wxWidget-limit-libs-used.patch to explicitely add + the needed libs. + + Try to handle differents WX versions between openSUSE and SLE + +------------------------------------------------------------------- New: ---- wxWidget-limit-libs-used.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pgadmin3.spec ++++++ --- /var/tmp/diff_new_pack.mF7U8s/_old 2017-02-03 18:55:21.166766735 +0100 +++ /var/tmp/diff_new_pack.mF7U8s/_new 2017-02-03 18:55:21.166766735 +0100 @@ -17,48 +17,57 @@ Name: pgadmin3 +Version: 1.22.2 +Release: 0 Summary: Management and Administration Tools for the PostgreSQL Database License: PostgreSQL Group: Productivity/Databases/Tools -Version: 1.22.2 -Release: 0 Url: http://www.pgadmin.org/index.php Source0: http://ftp.postgresql.org/pub/pgadmin3/release/v%{version}/src/pgadmin3-%{version}.tar.gz Source1: %name.desktop Source2: %name.png Source4: http://ftp.postgresql.org/pub/pgadmin3/release/v%{version}/src/pgadmin3-%{version}.tar.gz.sig +# Limit to strict minimum the needed wxWidgets inspired by debian patches +Patch0: wxWidget-limit-libs-used.patch BuildRequires: autoconf BuildRequires: automake +BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: libopenssl-devel BuildRequires: libtool BuildRequires: libxml2-devel BuildRequires: libxslt-devel BuildRequires: postgresql-devel -#Documentation build, sles doesn't know python-Sphinx -%if 0%{?suse_version} && 0%{?sles_version} -#dummy -%else -BuildRequires: python-Sphinx -%endif BuildRequires: update-desktop-files -%if 0%{?suse_version} >= 1140 +%if 0%{?suse_version} <= 1315 || 0%{?sle_version} > 0 +# One day a brave soul will find how to build that on SLE +#%%if 0%%{?sle_version} > 0 +#BuildRequires: libwx_baseu-2_8-0-wxcontainer +#BuildRequires: wxWidgets-devel < 2.9 +#%%else BuildRequires: wxWidgets BuildRequires: wxWidgets-wxcontainer-devel +#%%endif %define _use_internal_dependency_generator 0 %define __find_requires %wx_requires +%define WX_VER 2.8 %else -BuildRequires: wxGTK-devel +# Tumbleweed +# nostl mandatory otherwise you get errors at compile and runtime +# too much wxChar used +%define WX_VER 3.0 +BuildRequires: wxWidgets-3_0-nostl-devel %endif -BuildRoot: %{_tmppath}/%{name}-%{version}-build -%if 0%{?suse_version} >= 1030 -BuildRequires: fdupes -%endif -%if 0%{?sles_version} != 10 && 0%{?sles_version} != 9 -Suggests: postgresql-server +Requires: libpq5 >= 9.3 Recommends: %{name}-lang = %{version} +Suggests: postgresql-server +BuildRoot: %{_tmppath}/%{name}-%{version}-build +#Documentation build, sles doesn't know python-Sphinx +%if 0%{?sle_version} > 0 +#dummy +%else +BuildRequires: python-Sphinx %endif -Requires: libpq5 >= 9.3 %description pgAdmin III is an administration and management tool for the PostgreSQL @@ -71,33 +80,33 @@ features and makes administration easy. %lang_package + %prep %setup -q +%patch0 -p1 +autoreconf -fiv -%__sed -i 's/\r$//' LICENSE TODO CHANGELOG # remove wrong EOL -%__sed -i 's/\r$//' docs/fr_FR/pgadmin3.css # remove wrong EOL -%__sed -i 's/\r$//' docs/zh_CN/pgadmin3.css -%__sed -i 's/\r$//' docs/zh_TW/pgadmin3.css -%__sed -i 's/\r$//' docs/sl_SI/pgadmin3.css +sed -i 's/\r$//' LICENSE TODO CHANGELOG # remove wrong EOL +sed -i 's/\r$//' docs/*/pgadmin3.css # remove wrong EOL -%__rm -f docs/en_US/pgadmin3.hhp.cached # zero-length +rm -f docs/en_US/pgadmin3.hhp.cached # zero-length %build autoreconf -fiv export CXXFLAGS="%optflags -fno-delete-null-pointer-checks" -%configure --enable-databasedesigner --disable-static -%__make %{?_smp_mflags} +%configure --enable-databasedesigner --disable-static --with-wx-version=%{WX_VER} +make %{?_smp_mflags} %install -%__make DESTDIR="%{buildroot}" STRIP=/bin/true install -%__install -D -m0644 "%{SOURCE2}" "%{buildroot}%{_datadir}/pixmaps/%{name}.png" +make DESTDIR=%{buildroot} STRIP=/bin/true install +install -D -m0644 "%{SOURCE2}" "%{buildroot}%{_datadir}/pixmaps/%{name}.png" # whatever that symlink is doing there... -%__rm "%{buildroot}%{_datadir}/pgadmin3/i18n/wxstd.mo" +rm "%{buildroot}%{_datadir}/pgadmin3/i18n/wxstd.mo" # fix permissions -find "%{buildroot}%{_datadir}/pgadmin3/docs/" -type f -exec %__chmod 644 {} \; +find "%{buildroot}%{_datadir}/pgadmin3/docs/" -type f -exec chmod 644 {} \; # collect and mark localized files L="$PWD/%{name}.lang" @@ -106,13 +115,15 @@ d="${d#./}" echo "%lang(${d}) %{_datadir}/pgadmin3/i18n/${d}" >> "$L" done -popd #"%{buildroot}%{_datadir}/pgadmin3/i18n" +popd +#"%%{buildroot}%%{_datadir}/pgadmin3/i18n" pushd "%{buildroot}%{_datadir}/pgadmin3/docs" find . -type d -mindepth 1 -maxdepth 1 -name '*_*' | while read d; do d="${d#./}" echo "%doc %lang(${d}) %{_datadir}/pgadmin3/docs/${d}" >> "$L" done -popd #"%{buildroot}%{_datadir}/pgadmin3/docs" +popd +#"%%{buildroot}%%{_datadir}/pgadmin3/docs" %if 0%{?sles_version} == 10 || 0%{?sles_version} == 9 %suse_update_desktop_file %{name} System Database @@ -120,19 +131,12 @@ %suse_update_desktop_file -i %name System Database %endif -%if 0%{?suse_version} >= 1030 %fdupes -s "%{buildroot}%{_datadir}/pgadmin3" -%endif - -%clean -%{?buildroot:%__rm -rf "%{buildroot}"} %if 0%{?sles_version} != 10 && 0%{?sles_version} != 9 - %files %defattr(-, root, root) %else - %files -f %{name}.lang %endif %defattr(-, root, root) @@ -152,7 +156,6 @@ %{_datadir}/pixmaps/%{name}.png %if 0%{?sles_version} != 10 && 0%{?sles_version} != 9 - %files lang -f %{name}.lang %defattr(-, root, root) %endif ++++++ wxWidget-limit-libs-used.patch ++++++ diff -rup a/acinclude.m4 b/acinclude.m4 --- a/acinclude.m4 2016-01-07 13:47:31.000000000 +0100 +++ b/acinclude.m4 2017-01-23 16:45:02.066397424 +0100 @@ -743,7 +743,7 @@ AC_DEFUN([SETUP_WXWIDGETS], CFLAGS=`echo $CFLAGS | sed -e "s/-O2/-O0/g"` CXXFLAGS=`echo $CXXFLAGS | sed -e "s/-O2/-O0/g"` - pgadmin3_LDADD=`${WX_CONFIG} ${WX_STATIC} --libs std,stc,aui --unicode=yes --debug=yes --version=${WX_VERSION} 2> /dev/null` + pgadmin3_LDADD=`${WX_CONFIG} ${WX_STATIC} --libs xrc,html,qa,adv,core,xml,net,base,stc,aui --unicode=yes --debug=yes --version=${WX_VERSION} 2> /dev/null` pgsTest_LDADD=`${WX_CONFIG} ${WX_STATIC} --libs base,core,xml --unicode=yes --debug=yes --version=${WX_VERSION} 2> /dev/null` pgScript_LDADD=`${WX_CONFIG} ${WX_STATIC} --libs base,core,xml --unicode=yes --debug=yes --version=${WX_VERSION} 2> /dev/null` else @@ -752,7 +752,7 @@ AC_DEFUN([SETUP_WXWIDGETS], 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` + pgadmin3_LDADD=`${WX_CONFIG} ${WX_STATIC} --libs xrc,html,qa,adv,core,xml,net,base,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` pgScript_LDADD=`${WX_CONFIG} ${WX_STATIC} --libs base,core,xml --unicode=yes --debug=no --version=${WX_VERSION} 2> /dev/null` fi diff -rup a/pgadmin/frm/plugins.cpp b/pgadmin/frm/plugins.cpp --- a/pgadmin/frm/plugins.cpp 2016-01-07 13:47:32.000000000 +0100 +++ b/pgadmin/frm/plugins.cpp 2017-01-23 16:46:52.571092367 +0100 @@ -380,7 +380,7 @@ bool pluginUtilityFactory::CheckEnable(p { // If we need a specific server type, we can't enable unless // we have a connection. - if (!obj || !(obj->GetConnection()->GetStatus() == PGCONN_OK)) + if (!obj || !obj->GetConnection() || !(obj->GetConnection()->GetStatus() == PGCONN_OK)) return false; // Get the server type.
