rpms/postgresql-jdbc
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix FTBFS due to obsolete gcj BuildRequires

Browse Source
This commit is contained in:
Tom Lane 2010-05-31 19:43:44 +00:00
parent 9a9a07fd44
commit ed9e4241ba
1 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
postgresql-jdbc.spec
View File

@ -38,7 +38,7 @@
Summary: JDBC driver for PostgreSQL Summary: JDBC driver for PostgreSQL
Name: postgresql-jdbc Name: postgresql-jdbc
Version: 8.4.701 Version: 8.4.701
Release: 3%{?dist} Release: 4%{?dist}
# ASL 2.0 applies only to postgresql-jdbc.pom file, the rest is BSD # ASL 2.0 applies only to postgresql-jdbc.pom file, the rest is BSD
License: BSD and ASL 2.0 License: BSD and ASL 2.0
Group: Applications/Databases Group: Applications/Databases
@ -60,9 +60,9 @@ BuildRequires: findutils
# gettext is only needed if we try to update translations # gettext is only needed if we try to update translations
#BuildRequires: gettext #BuildRequires: gettext
%if %{gcj_support} %if %{gcj_support}
BuildRequires: gcc-java BuildRequires: java-gcj-compat-devel >= 1.0.31
Requires(post): /usr/bin/rebuild-gcj-db Requires(post): java-gcj-compat >= 1.0.31
Requires(postun): /usr/bin/rebuild-gcj-db Requires(postun): java-gcj-compat >= 1.0.31
%endif %endif
Requires(post): jpackage-utils >= 0:1.7.2 Requires(post): jpackage-utils >= 0:1.7.2
Requires(postun): jpackage-utils >= 0:1.7.2 Requires(postun): jpackage-utils >= 0:1.7.2
@ -116,7 +116,7 @@ ln -s postgresql-jdbc.jar postgresql-jdbc3.jar
popd popd
%if %{gcj_support} %if %{gcj_support}
aot-compile-rpm %{_bindir}/aot-compile-rpm
%endif %endif
# Install the pom after inserting the correct version number # Install the pom after inserting the correct version number
@ -128,16 +128,22 @@ install -m 644 JPP-postgresql-jdbc.pom $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JP
%clean %clean
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
%if %{gcj_support}
%post %post
/usr/bin/rebuild-gcj-db
%update_maven_depmap %update_maven_depmap
%if %{gcj_support}
if [ -x %{_bindir}/rebuild-gcj-db ]
then
%{_bindir}/rebuild-gcj-db
fi
%endif
%postun %postun
/usr/bin/rebuild-gcj-db
%update_maven_depmap %update_maven_depmap
%if %{gcj_support}
if [ -x %{_bindir}/rebuild-gcj-db ]
then
%{_bindir}/rebuild-gcj-db
fi
%endif %endif
%files %files
@ -145,14 +151,16 @@ rm -rf $RPM_BUILD_ROOT
%doc LICENSE README doc/* %doc LICENSE README doc/*
%{_javadir}/* %{_javadir}/*
%if %{gcj_support} %if %{gcj_support}
%dir %{_libdir}/gcj/%{name} %attr(-,root,root) %{_libdir}/gcj/%{name}
%{_libdir}/gcj/%{name}/*.jar.so
%{_libdir}/gcj/%{name}/*.jar.db
%endif %endif
%{_sysconfdir}/maven/fragments/%{name} %{_sysconfdir}/maven/fragments/%{name}
%{_datadir}/maven2/poms/JPP-%{name}.pom %{_datadir}/maven2/poms/JPP-%{name}.pom
%changelog %changelog
* Mon May 31 2010 Tom Lane <tgl@redhat.com> 8.4.701-4
- Update gcj_support sections to meet Packaging/GCJGuidelines;
fixes FTBFS in F-14 rawhide
* Tue Nov 24 2009 Tom Lane <tgl@redhat.com> 8.4.701-3 * Tue Nov 24 2009 Tom Lane <tgl@redhat.com> 8.4.701-3
- Seems the .pom file *must* have a package version number in it, sigh - Seems the .pom file *must* have a package version number in it, sigh
Resolves: #538487 Resolves: #538487