rpms/pgadmin3/devel .cvsignore, 1.11, 1.12 pgadmin3.spec, 1.22, 1.23 sources, 1.11, 1.12

[Devrim GÜNDÜZ]

Author: devrim

Update of /cvs/extras/rpms/pgadmin3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4805

Modified Files:
	.cvsignore pgadmin3.spec sources 
Log Message:
- Update to 1.10.0
- Update licence
- Incorporate some changes from rpmfusion:
  Corrected pgadmin3 documentation path to avoid errors (#448)
  Re-added the branding directory for some users (RHBZ #473748)
  Removed useless -docs package, main package shipped it anyway
  Many spec file and package cleanups to get rpmlint very silent




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pgadmin3/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	4 Jun 2008 19:46:00 -0000	1.11
+++ .cvsignore	29 Jun 2009 15:02:11 -0000	1.12
@@ -1 +1 @@
-pgadmin3-1.8.4.tar.gz
+pgadmin3-1.10.0.tar.gz


Index: pgadmin3.spec
===================================================================
RCS file: /cvs/extras/rpms/pgadmin3/devel/pgadmin3.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- pgadmin3.spec	14 Jul 2008 04:26:31 -0000	1.22
+++ pgadmin3.spec	29 Jun 2009 15:02:11 -0000	1.23
@@ -1,11 +1,11 @@
 Summary:	Graphical client for PostgreSQL
 Name:		pgadmin3
-Version:	1.8.4
-Release:	2%{?dist}
-License:	Artistic
+Version:	1.10.0
+Release:	1%{?dist}
+License:	BSD
 Group:		Applications/Databases
 Source:		ftp://ftp.postgresql.org/pub/pgadmin3/release/v%{version}/src/%{name}-%{version}.tar.gz
-Patch0:		%{name}-1.8.4-optflags.patch
+Patch0:		%{name}-1.10.0-optflags.patch
 URL:		http://www.pgadmin.org/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	wxGTK-devel postgresql-devel desktop-file-utils openssl-devel libxml2-devel libxslt-devel
@@ -28,15 +28,6 @@ SQL/batch/shell job scheduling agent, su
 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
 # touch to avoid autotools re-run
@@ -50,35 +41,59 @@ export LIBS="-lwx_gtk2u_core-2.8"
 make %{?_smp_mflags} all
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT install
+rm -rf %{buildroot}
+make DESTDIR=%{buildroot} install
 
-cp -f ./pkg/debian/pgadmin3.xpm $RPM_BUILD_ROOT/%{_datadir}/%{name}/%{name}.xpm
+cp -f ./pkg/debian/pgadmin3.xpm %{buildroot}/%{_datadir}/%{name}/%{name}.xpm
 
-mkdir -p $RPM_BUILD_ROOT/%{_datadir}/applications
+mkdir -p %{buildroot}/%{_datadir}/applications
 
-desktop-file-install --vendor fedora --dir $RPM_BUILD_ROOT/%{_datadir}/applications \
-	--add-category X-Fedora\
-	--add-category Application\
-	--add-category Development\
-	./pkg/%{name}.desktop
+desktop-file-install --dir %{buildroot}%{_datadir}/applications \
+%if 0%{?rhel}
+	--vendor="" \
+%endif
+	--add-category Development pkg/%{name}.desktop
+
+# Convert changelog, fix incorrect end-of-line encoding
+iconv -f iso-8859-1 -t utf-8 -o CHANGELOG.utf8 CHANGELOG
+sed -i 's/\r$//' CHANGELOG.utf8
+touch -c -r CHANGELOG CHANGELOG.utf8
+mv -f CHANGELOG.utf8 CHANGELOG
+
+# Remove unwanted and double files
+rm -f docs/{Docs.vcproj,builddocs.bat}
+rm -rf %{buildroot}%{_datadir}/%{name}/docs
+rm -f %{buildroot}%{_datadir}/%{name}/i18n/{*,.}/wxstd.mo
+
+# Correct permissions to solve rpmlint debuginfo noise
+chmod 644 pgadmin/include/images/{package,synonym}{,s}.xpm
+
+# Move locales to their correct place
+mkdir -p %{buildroot}%{_datadir}/locale
+mv -f %{buildroot}%{_datadir}/%{name}/i18n/??_?? %{buildroot}%{_datadir}/locale
 
+%find_lang %{name}
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
-%files
-%defattr(-, root, root)
-%doc BUGS CHANGELOG LICENSE README
+%files -f %{name}.lang
+%defattr(-,root,root)
+%doc BUGS CHANGELOG LICENSE README docs/*
 %{_bindir}/*
 %{_datadir}/%{name}
 %{_datadir}/applications/*
 
-%files docs
-%defattr(-,root,root)
-%doc docs/*
-
 %changelog
+* Mon Jun 29 2009 Devrim GUNDUZ <devrim at gunduz.org> 1.10.0-1
+- Update to 1.10.0
+- Update licence
+- Incorporate some changes from rpmfusion:
+  Corrected pgadmin3 documentation path to avoid errors (#448)
+  Re-added the branding directory for some users (RHBZ #473748)
+  Removed useless -docs package, main package shipped it anyway
+  Many spec file and package cleanups to get rpmlint very silent
+
 * Mon Jul 14 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.8.4-2
 - Use $RPM_OPT_FLAGS, build with dependency tracking disabled (#229054).
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pgadmin3/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	4 Jun 2008 19:46:00 -0000	1.11
+++ sources	29 Jun 2009 15:02:11 -0000	1.12
@@ -1 +1 @@
-12fc6027f651788615a7fa1c6ddbcdb3  pgadmin3-1.8.4.tar.gz
+3f2032c78657e3db4e0719613751060c  pgadmin3-1.10.0.tar.gz