commit 9f647378d585af335f40f319a07ca19d4811f100
Author: Arkadiusz Miśkiewicz <[email protected]>
Date: Sat Sep 22 22:42:07 2018 +0200
- initial; unfinished
pgadmin3-m4.patch | 65 ------------------------------------
pgadmin3.desktop => pgadmin4.desktop | 8 ++---
pgadmin3.spec => pgadmin4.spec | 64 ++++++++++++++++-------------------
3 files changed, 32 insertions(+), 105 deletions(-)
---
diff --git a/pgadmin3.spec b/pgadmin4.spec
similarity index 60%
rename from pgadmin3.spec
rename to pgadmin4.spec
index 914d390..c584162 100644
--- a/pgadmin3.spec
+++ b/pgadmin4.spec
@@ -1,30 +1,26 @@
+# TODO:
+# - install py stuff
Summary: Powerful administration and development platform for the
PostgreSQL
Summary(pl.UTF-8): Potężna platforma do administrowania i programowania
bazy PostgreSQL
-Name: pgadmin3
-Version: 1.22.2
-Release: 1.1
-Epoch: 0
+Name: pgadmin4
+Version: 3.3
+Release: 0.1
License: Artistic
Group: Applications/Databases
-Source0:
http://ftp.postgresql.org/pub/pgadmin3/release/v%{version}/src/%{name}-%{version}.tar.gz
-# Source0-md5: cc5ad37470e36b3353ab925a8e82eb35
+Source0:
http://ftp.postgresql.org/pub/pgadmin/pgadmin4/v%{version}/source/%{name}-%{version}.tar.gz
+# Source0-md5: 6dfd363dd2cf21efe35330c6e4a87f03
Source1: %{name}.desktop
-Patch0: %{name}-m4.patch
-Patch1: %{name}-LTS.patch
URL: http://pgadmin3.org/
-BuildRequires: autoconf
-BuildRequires: automake
-BuildRequires: libxml2-devel >= 2.6.18
-BuildRequires: libxslt-devel >= 1.1
-BuildRequires: openssl-devel
+BuildRequires: python3-devel
BuildRequires: postgresql-backend-devel >= 8.3.0
BuildRequires: postgresql-devel >= 8.3.0
-BuildRequires: wxGTK2-unicode-gl-devel >= 2.8.0
-BuildRequires: wxWidgets-utils >= 2.8.0
+BuildRequires: qt5-qmake
+BuildRequires: Qt5Core-devel
+BuildRequires: Qt5Gui-devel
+BuildRequires: Qt5Network-devel
+BuildRequires: Qt5Widgets-devel
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-%define _pgmoduledir %{_libdir}/postgresql
-
%description
pgAdmin III is designed to answer the needs of all users, from writing
simple SQL queries to developing complex databases. The graphical
@@ -46,38 +42,34 @@ komunikowania z serwerem baz danych.
%prep
%setup -q
-%patch0 -p1
-%patch1 -p1
%build
-rm -f config/*
-./bootstrap
-%{__aclocal}
-%{__autoconf}
-cp -f config.rpath.in config/config.rpath
-%{__automake}
-%configure \
- --with-wx-config="%{_bindir}/wx-gtk2-unicode-config" \
- --with-wx-version="3.0"
+cd runtime
+
+PYTHON_CONFIG=%{_bindir}/python3-config \
+qmake-qt5
%{__make}
%install
rm -rf $RPM_BUILD_ROOT
+
install -d \
- $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir},%{_pgmoduledir}}
+ $RPM_BUILD_ROOT{%{_bindir},%{_desktopdir},%{_pixmapsdir}}
-%{__make} install \
+%{__make} -C runtime install \
DESTDIR=$RPM_BUILD_ROOT
+
+install runtime/pgAdmin4 $RPM_BUILD_ROOT%{_bindir}/pgadmin4
+
cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
-cp -p pkg/debian/pgadmin3.xpm $RPM_BUILD_ROOT%{_pixmapsdir}/pgadmin3.xpm
+cp -p runtime/pgAdmin4.png $RPM_BUILD_ROOT%{_pixmapsdir}/pgadmin4.png
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
-%doc LICENSE README
-%attr(755,root,root) %{_bindir}/*
-%{_datadir}/%{name}
-%{_desktopdir}/pgadmin3.desktop
-%{_pixmapsdir}/pgadmin3.xpm
+%doc LICENSE README docs/en_US
+%attr(755,root,root) %{_bindir}/pgadmin4
+%{_desktopdir}/pgadmin4.desktop
+%{_pixmapsdir}/pgadmin4.png
diff --git a/pgadmin3-m4.patch b/pgadmin3-m4.patch
deleted file mode 100644
index bbf7574..0000000
--- a/pgadmin3-m4.patch
+++ /dev/null
@@ -1,65 +0,0 @@
---- pgadmin3-1.14.0/acinclude.m4~ 2011-09-17 10:05:51.000000000 +0200
-+++ pgadmin3-1.14.0/acinclude.m4 2011-09-17 10:09:19.127611445 +0200
-@@ -69,41 +69,9 @@
- ####################
- AC_DEFUN([LOCATE_WXWIDGETS],
- [
-- AC_ARG_WITH(wx, [ --with-wx=DIR root directory for
wxWidgets installation],
-- [
-- if test "$withval" != no
-- then
-- WX_HOME="$withval"
-- if test ! -f "${WX_HOME}/bin/wx-config"
-- then
-- AC_MSG_ERROR([Could not find your wxWidgets
installation in ${WX_HOME}])
-- fi
--
-- fi
-- WX_CONFIG=${WX_HOME}/bin/wx-config
-- ],
-- [
-- WX_HOME=/usr/local/wx2
-- if test ! -f "${WX_HOME}/bin/wx-config"
-- then
-- WX_HOME=/usr/local
-- if test ! -f "${WX_HOME}/bin/wx-config"
-- then
-- WX_HOME=/usr
-- if test ! -f "${WX_HOME}/bin/wx-config"
-- then
-- # Search the path
-- AC_PATH_PROGS(WX_CONFIG, wx-config)
-- if test ! -f "${WX_CONFIG}"
-- then
-- AC_MSG_ERROR([Could not find your wxWidgets
installation. You might need to use the --with-wx=DIR configure option])
-- else
-- WX_HOME=`${WX_CONFIG} --prefix`
-- fi
-- fi
-- fi
-- fi
-- WX_CONFIG=${WX_HOME}/bin/wx-config
-+ WX_HOME=/usr
-+ AC_ARG_WITH(wx-config, [ --with-wx-config=FILE wx-config file],[
-+ WX_CONFIG="$withval"
- ])
- ])
-
---- pgadmin3-1.14.0/acinclude.m4~ 2011-09-17 10:09:39.000000000 +0200
-+++ pgadmin3-1.14.0/acinclude.m4 2011-09-17 10:13:44.928871229 +0200
-@@ -475,6 +475,7 @@
- else
- PG_SSL="no"
- fi
-+ PG_SSL=yes
-
- if test "$LIB_KRB5" = "yes"
- then
-@@ -512,6 +513,7 @@
- else
- PG_KRB5="no"
- fi
-+ PG_KRB5=yes
-
- AC_LANG_RESTORE
-
diff --git a/pgadmin3.desktop b/pgadmin4.desktop
similarity index 63%
rename from pgadmin3.desktop
rename to pgadmin4.desktop
index b23acaa..2ab2c59 100644
--- a/pgadmin3.desktop
+++ b/pgadmin4.desktop
@@ -1,11 +1,11 @@
[Desktop Entry]
-Name=pgAdmin III
+Name=pgAdmin 4
Comment=PostgreSQL frontend
Comment[pl]=Narzêdzie do PostgreSQL
-Exec=pgadmin3
-Icon=pgadmin3
+Exec=pgadmin4
+Icon=pgadmin4
Terminal=false
Type=Application
Categories=Database;System;
-DocPath=/usr/share/pgadmin3/docs/en_US/index.html
+DocPath=/usr/share/pgadmin4/docs/en_US/index.html
# vi: encoding=utf-8
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/pgadmin4.git/commitdiff/9f647378d585af335f40f319a07ca19d4811f100
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
