SPECS: pgadmin3.spec - builds now

[arekm]

Author: arekm                        Date: Thu Dec  7 23:38:51 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- builds now

---- Files affected:
SPECS:
   pgadmin3.spec (1.21 -> 1.22) 

---- Diffs:

================================================================
Index: SPECS/pgadmin3.spec
diff -u SPECS/pgadmin3.spec:1.21 SPECS/pgadmin3.spec:1.22
--- SPECS/pgadmin3.spec:1.21	Sat Dec  2 19:46:38 2006
+++ SPECS/pgadmin3.spec	Fri Dec  8 00:38:46 2006
@@ -3,21 +3,24 @@
 Summary(pl):	Potężna platforma do administrowania i programowania bazy PostgreSQL
 Name:		pgadmin3
 Version:	1.6.1
-Release:	0.1
+Release:	0.2
 Epoch:		0
 License:	Artistic
 Group:		Applications/Databases
 Source0:	ftp://ftp6.pl.postgresql.org/pub/postgresql/pgadmin3/release/v%{version}/src/%{name}-%{version}.tar.gz
 # Source0-md5:	0cdfffceb09e40787ead39541bcd5683
 Source1:	%{name}.desktop
+Patch0:		%{name}-m4.patch
+Patch1:		%{name}-wx.patch
 URL:		http://www.pgadmin.org/
+BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	libxml2 >= 2.6.18
 BuildRequires:	libxslt >= 1.1
 BuildRequires:	openssl-devel
 BuildRequires:	postgresql-devel >= 7.4
 BuildRequires:	postgresql-backend-devel >= 7.4
-BuildRequires:	wxGTK2-unicode-gl-devel >= 2.7.0
+BuildRequires:	wxGTK2-unicode-gl-devel >= 2.8.0
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_pgmoduledir		%{_libdir}/postgresql
@@ -57,11 +60,17 @@
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
 
 %build
-cp /usr/share/automake/config.sub config
+rm -f config/*
+%{__aclocal}
+%{__autoconf}
+%{__automake}
 %configure \
-	--with-wx-config=wx-gtk2-unicode-config
+	--with-wx-config="%{_bindir}/wx-gtk2-unicode-config" \
+	--with-wx-version="2.8"
 %{__make}
 
 sed 's#MODULE_PATHNAME#%{_pgmoduledir}/admin81#g' xtra/admin81/admin81.sql.in > xtra/admin81/admin81.sql
@@ -85,7 +94,7 @@
 
 %files
 %defattr(644,root,root,755)
-%doc LICENCE.txt README.txt
+%doc LICENSE README
 %attr(755,root,root) %{_bindir}/*
 %{_datadir}/%{name}
 %{_desktopdir}/pgadmin3.desktop
@@ -102,6 +111,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.22  2006/12/07 23:38:46  arekm
+- builds now
+
 Revision 1.21  2006/12/02 18:46:38  psz
 - up to 1.6.1
 - rel 0.1 (not tested)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/pgadmin3.spec?r1=1.21&r2=1.22&f=u