rpms/pgadmin3/EL-4 pgadmin3-rhel4libxml.patch, NONE, 1.1 pgadmin3.spec, 1.2, 1.3
Devrim GÜNDÜZ (devrim)
fedora-extras-commits at redhat.com
Thu Jun 19 03:49:01 UTC 2008
- Previous message (by thread): rpms/kernel/F-9 drm-radeon-update.patch, 1.1, 1.2 kernel.spec, 1.683, 1.684
- Next message (by thread): rpms/pgadmin3/EL-5 .cvsignore, 1.5, 1.6 pgadmin3.spec, 1.12, 1.13 sources, 1.5, 1.6
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: devrim
Update of /cvs/extras/rpms/pgadmin3/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28537
Modified Files:
pgadmin3.spec
Added Files:
pgadmin3-rhel4libxml.patch
Log Message:
Initial import of pgadmin3 to EL-4.
pgadmin3-rhel4libxml.patch:
--- NEW FILE pgadmin3-rhel4libxml.patch ---
--- acinclude.m4.old 2008-01-19 01:45:58.000000000 -0800
+++ acinclude.m4 2008-01-19 01:45:39.000000000 -0800
@@ -228,13 +228,13 @@
XML2_REVISION=`expr ${XML2_VERSION} : '[0-9]*\.[0-9]*\.\([0-9]*\)'`
changequote([, ])dnl
if test "$XML2_MAJOR" -lt 2; then
- AC_MSG_ERROR([libxml2 2.6.18 or newer is require to build pgAdmin])
+ AC_MSG_ERROR([libxml2 2.6.16 or newer is require to build pgAdmin])
fi
if test "$XML2_MAJOR" -eq 2 && test "$XML2_MINOR" -lt 6; then
- AC_MSG_ERROR([libxml2 2.6.18 or newer is require to build pgAdmin])
+ AC_MSG_ERROR([libxml2 2.6.16 or newer is require to build pgAdmin])
fi
- if test "$XML2_MAJOR" -eq 2 && test "$XML2_MINOR" -eq 6 && test "$XML2_REVISION" -lt 18; then
- AC_MSG_ERROR([libxml2 2.6.18 or newer is require to build pgAdmin])
+ if test "$XML2_MAJOR" -eq 2 && test "$XML2_MINOR" -eq 6 && test "$XML2_REVISION" -lt 16; then
+ AC_MSG_ERROR([libxml2 2.6.16 or newer is require to build pgAdmin])
fi
AC_MSG_RESULT(ok)
])
--- configure.old 2008-01-19 01:45:51.000000000 -0800
+++ configure 2008-01-19 01:45:39.000000000 -0800
@@ -6160,18 +6160,18 @@
XML2_MINOR=`expr ${XML2_VERSION} : '[0-9]*\.\([0-9]*\)'`
XML2_REVISION=`expr ${XML2_VERSION} : '[0-9]*\.[0-9]*\.\([0-9]*\)'`
if test "$XML2_MAJOR" -lt 2; then
- { { echo "$as_me:$LINENO: error: libxml2 2.6.18 or newer is require to build pgAdmin" >&5
-echo "$as_me: error: libxml2 2.6.18 or newer is require to build pgAdmin" >&2;}
+ { { echo "$as_me:$LINENO: error: libxml2 2.6.16 or newer is require to build pgAdmin" >&5
+echo "$as_me: error: libxml2 2.6.16 or newer is require to build pgAdmin" >&2;}
{ (exit 1); exit 1; }; }
fi
if test "$XML2_MAJOR" -eq 2 && test "$XML2_MINOR" -lt 6; then
- { { echo "$as_me:$LINENO: error: libxml2 2.6.18 or newer is require to build pgAdmin" >&5
-echo "$as_me: error: libxml2 2.6.18 or newer is require to build pgAdmin" >&2;}
+ { { echo "$as_me:$LINENO: error: libxml2 2.6.16 or newer is require to build pgAdmin" >&5
+echo "$as_me: error: libxml2 2.6.16 or newer is require to build pgAdmin" >&2;}
{ (exit 1); exit 1; }; }
fi
- if test "$XML2_MAJOR" -eq 2 && test "$XML2_MINOR" -eq 6 && test "$XML2_REVISION" -lt 18; then
- { { echo "$as_me:$LINENO: error: libxml2 2.6.18 or newer is require to build pgAdmin" >&5
-echo "$as_me: error: libxml2 2.6.18 or newer is require to build pgAdmin" >&2;}
+ if test "$XML2_MAJOR" -eq 2 && test "$XML2_MINOR" -eq 6 && test "$XML2_REVISION" -lt 16; then
+ { { echo "$as_me:$LINENO: error: libxml2 2.6.16 or newer is require to build pgAdmin" >&5
+echo "$as_me: error: libxml2 2.6.16 or newer is require to build pgAdmin" >&2;}
{ (exit 1); exit 1; }; }
fi
echo "$as_me:$LINENO: result: ok" >&5
Index: pgadmin3.spec
===================================================================
RCS file: /cvs/extras/rpms/pgadmin3/EL-4/pgadmin3.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pgadmin3.spec 10 Dec 2004 22:03:09 -0000 1.2
+++ pgadmin3.spec 19 Jun 2008 03:46:58 -0000 1.3
@@ -1,61 +1,80 @@
-Summary: Graphical client for PostgreSQL.
-Name: pgadmin3
-Version: 1.0.2
-Release: 3
+Summary: Graphical client for PostgreSQL
+Name: pgadmin3
+Version: 1.8.4
+Release: 1%{?dist}
License: Artistic
-Epoch: 0
Group: Applications/Databases
-Source: ftp://ftp.postgresql.org/pub/pgadmin3/release/src/pgadmin3-1.0.2.tar.gz
-URL: http://www.pgadmin.org/
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: wxGTK2-devel wxGTK2-stc wxGTK2-xrc postgresql-devel desktop-file-utils openssl-devel
+Source: ftp://ftp.postgresql.org/pub/pgadmin3/release/v%{version}/src/%{name}-%{version}.tar.gz
+Patch2: %{name}-rhel4libxml.patch
+URL: http://www.pgadmin.org/
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires: wxGTK-devel postgresql-devel >= 8.0
+BuildRequires: desktop-file-utils openssl-devel libxml2-devel libxslt-devel
+Requires: wxGTK
%description
-pgAdmin III is a comprehensive PostgreSQL database design
-and management system for *nix and Windows systems.
+pgAdmin III is a powerful administration and development
+platform for the PostgreSQL database, free for any use.
+It is designed to answer the needs of all users,
+from writing simple SQL queries to developing complex
+databases. The graphical interface supports all PostgreSQL
+features and makes administration easy.
+
+pgAdmin III is designed to answer the needs of all users,
+from writing simple SQL queries to developing complex databases.
+The graphical interface supports all PostgreSQL features and
+makes administration easy. The application also includes a syntax
+highlighting SQL editor, a server-side code editor, an
+SQL/batch/shell job scheduling agent, support for the Slony-I
+replication engine and much more. No additional drivers are
+required to communicate with the database server.
+
+%package docs
+Summary: Documentation for pgAdmin3
+Group: Applications/Databases
+Requires: %{name} = %{version}
+
+%description docs
+This package contains documentation for various languages,
+which are in html format.
%prep
%setup -q
-
+%patch2 -p0
%build
-%configure
-#Somehow doesn't link in these..
-make %{?_smp_mflags} LDFLAGS="-lwx_gtk2-2.4 -lwx_gtk2_stc-2.4 -lwx_gtk2_xrc-2.4" all
+export LIBS="-lwx_gtk2u_core-2.8"
+%configure --disable-debug --with-wx-version=2.8 --with-wx=/usr
+make %{?_smp_mflags} all
%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install
-cp -f ./src/include/images/elephant48.xpm $RPM_BUILD_ROOT/%{_datadir}/%{name}/%{name}.xpm
+cp -f ./pkg/debian/pgadmin3.xpm $RPM_BUILD_ROOT/%{_datadir}/%{name}/%{name}.xpm
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/applications
desktop-file-install --vendor fedora --dir $RPM_BUILD_ROOT/%{_datadir}/applications \
--add-category X-Fedora\
--add-category Application\
- --add-category System\
- ./pkg/%{name}.desktop
+ --add-category Development\
+ ./pkg/%{name}.desktop
%clean
rm -rf $RPM_BUILD_ROOT
-%files
+%files
%defattr(-, root, root)
-%doc LICENCE.txt BUGS.txt README.txt
+%doc BUGS CHANGELOG LICENSE README
%{_bindir}/*
%{_datadir}/%{name}
%{_datadir}/applications/*
-%changelog
-* Thu Oct 07 2004 Nils O. Selåsdal <NOS|at|Utel.no> - 0:1.0.2-0.fdr.3
-- include LICENCE.txt BUGS.txt README.txt
-- Use master location in Source
-- Don't --delete-original .desktop file.
-* Thu Oct 07 2004 Nils O. Selåsdal <NOS|at|Utel.no> - 0:1.0.2-0.fdr.2
-- Don't own _datadir/applications/
-- Fedora -> fedora for .desktop file
-- Use _smp_mflags for make
-* Wed Oct 06 2004 Nils O. Selåsdal <NOS|at|Utel.no> - 0:1.0.2-0.fdr.1
-- Initial RPM
+%files docs
+%defattr(-,root,root)
+%doc docs/*
+%changelog
+* Thu Jun 19 2008 Devrim GUNDUZ <devrim at commandprompt.com> 1.8.4-1
+- Initial import of pgadmin3 to EL-4
- Previous message (by thread): rpms/kernel/F-9 drm-radeon-update.patch, 1.1, 1.2 kernel.spec, 1.683, 1.684
- Next message (by thread): rpms/pgadmin3/EL-5 .cvsignore, 1.5, 1.6 pgadmin3.spec, 1.12, 1.13 sources, 1.5, 1.6
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list