[postgresql-jdbc] spec: lint specfile
Pavel Raiskup
praiskup at fedoraproject.org
Tue Aug 6 12:01:04 UTC 2013
commit ff9cd905aa2c1268ff738eb5a19153ca64056d7b
Author: Pavel Raiskup <praiskup at redhat.com>
Date: Tue Aug 6 13:39:28 2013 +0200
spec: lint specfile
Fix some FedoraReview warnings, trim lines, use tabs only, ..
Version: 9.2.1002-4
postgresql-jdbc.spec | 27 ++++++++++++---------------
1 files changed, 12 insertions(+), 15 deletions(-)
---
diff --git a/postgresql-jdbc.spec b/postgresql-jdbc.spec
index 00756b3..ed151d9 100644
--- a/postgresql-jdbc.spec
+++ b/postgresql-jdbc.spec
@@ -46,7 +46,7 @@ URL: http://jdbc.postgresql.org/
Source0: http://jdbc.postgresql.org/download/%{name}-%{upstreamver}.src.tar.gz
# originally http://repo2.maven.org/maven2/postgresql/postgresql/8.4-701.jdbc4/postgresql-8.4-701.jdbc4.pom:
-Source1: postgresql-jdbc.pom
+Source1: %{name}.pom
%if ! %{gcj_support}
BuildArch: noarch
@@ -56,17 +56,16 @@ BuildRequires: jpackage-utils
BuildRequires: ant
BuildRequires: ant-junit
BuildRequires: junit
-BuildRequires: findutils
# gettext is only needed if we try to update translations
#BuildRequires: gettext
%if %{gcj_support}
-BuildRequires: java-gcj-compat-devel >= 1.0.31
-Requires(post): java-gcj-compat >= 1.0.31
-Requires(postun): java-gcj-compat >= 1.0.31
+BuildRequires: java-gcj-compat-devel >= 1.0.31
+Requires(post): java-gcj-compat >= 1.0.31
+Requires(postun): java-gcj-compat >= 1.0.31
%endif
-Requires: java
-Requires(post): jpackage-utils
-Requires(postun): jpackage-utils
+Requires: java
+Requires(post): jpackage-utils
+Requires(postun): jpackage-utils
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -97,8 +96,6 @@ export CLASSPATH=
ant
%install
-rm -rf ${RPM_BUILD_ROOT}
-
install -d $RPM_BUILD_ROOT%{_javadir}
# Per jpp conventions, jars have version-numbered names and we add
# versionless symlinks.
@@ -118,18 +115,17 @@ popd
%endif
# Install the pom after inserting the correct version number
-sed 's/UPSTREAM_VERSION/%{upstreamver}/g' %{SOURCE1} >JPP-postgresql-jdbc.pom
+sed 's/UPSTREAM_VERSION/%{upstreamver}/g' %{SOURCE1} >JPP-%{name}.pom
install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}/
-install -m 644 JPP-postgresql-jdbc.pom $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-postgresql-jdbc.pom
+install -m 644 JPP-%{name}.pom $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
%add_maven_depmap JPP-%{name}.pom %{name}.jar
%clean
-rm -rf $RPM_BUILD_ROOT
%post
%update_maven_depmap
%if %{gcj_support}
- if [ -x %{_bindir}/rebuild-gcj-db ]
+ if [ -x %{_bindir}/rebuild-gcj-db ]
then
%{_bindir}/rebuild-gcj-db
fi
@@ -138,7 +134,7 @@ rm -rf $RPM_BUILD_ROOT
%postun
%update_maven_depmap
%if %{gcj_support}
- if [ -x %{_bindir}/rebuild-gcj-db ]
+ if [ -x %{_bindir}/rebuild-gcj-db ]
then
%{_bindir}/rebuild-gcj-db
fi
@@ -157,6 +153,7 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Tue Aug 06 2013 Pavel Raiskup <praiskup at redhat.com> - 9.2.1002-4
- don't use removed macro %%add_to_maven_depmap (#992816)
+- lint: trim-lines, reuse %%{name} macro, fedora-review fixes
* Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 9.2.1002-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
More information about the scm-commits
mailing list