spec: cleanup by Stano, thanks!

Version: 9.2.1002-4

postgresql-jdbc.spec

@@ -28,10 +28,6 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
-%global _gcj_support 0
-
-%global gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
-
 %global section		devel
 %global upstreamver	9.2-1002
 
@@ -48,9 +44,7 @@ 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:	%{name}.pom
 
-%if ! %{gcj_support}
 BuildArch:	noarch
-%endif
 BuildRequires:	java-devel
 BuildRequires:	jpackage-utils
 BuildRequires:	ant
@@ -58,16 +52,8 @@ BuildRequires:	ant-junit
 BuildRequires:	junit
 # gettext is only needed if we try to update translations
 #BuildRequires:	gettext
-%if %{gcj_support}
+Requires:	java
-BuildRequires:		java-gcj-compat-devel >= 1.0.31
+Requires:	jpackage-utils
-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
-
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 %description
 PostgreSQL is an advanced Object-Relational database management
@@ -99,10 +85,9 @@ ant
 install -d $RPM_BUILD_ROOT%{_javadir}
 # Per jpp conventions, jars have version-numbered names and we add
 # versionless symlinks.
-install -m 644 jars/postgresql.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
+install -m 644 jars/postgresql.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
 
 pushd $RPM_BUILD_ROOT%{_javadir}
-ln -s %{name}-%{version}.jar %{name}.jar
 # Also, for backwards compatibility with our old postgresql-jdbc packages,
 # add these symlinks.  (Probably only the jdbc3 symlink really makes sense?)
 ln -s postgresql-jdbc.jar postgresql-jdbc2.jar
@@ -110,50 +95,23 @@ ln -s postgresql-jdbc.jar postgresql-jdbc2ee.jar
 ln -s postgresql-jdbc.jar postgresql-jdbc3.jar
 popd
 
-%if %{gcj_support}
-%{_bindir}/aot-compile-rpm
-%endif
-
 # Install the pom after inserting the correct version number
 sed 's/UPSTREAM_VERSION/%{upstreamver}/g' %{SOURCE1} >JPP-%{name}.pom
 install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}/
 install -m 644 JPP-%{name}.pom $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
-%add_maven_depmap JPP-%{name}.pom %{name}.jar
+%add_maven_depmap
 
-%clean
+%files -f .mfiles
-
-%post
-%update_maven_depmap
-%if %{gcj_support}
-  if [ -x %{_bindir}/rebuild-gcj-db ]
-  then
-    %{_bindir}/rebuild-gcj-db
-  fi
-%endif
-
-%postun
-%update_maven_depmap
-%if %{gcj_support}
-  if [ -x %{_bindir}/rebuild-gcj-db ]
-  then
-    %{_bindir}/rebuild-gcj-db
-  fi
-%endif
-
-%files
-%defattr(-,root,root)
 %doc LICENSE README doc/*
-%{_javadir}/*
+%{_javadir}/%{name}2.jar
-%if %{gcj_support}
+%{_javadir}/%{name}2ee.jar
-%attr(-,root,root) %{_libdir}/gcj/%{name}
+%{_javadir}/%{name}3.jar
-%endif
-%{_mavendepmapfragdir}/%{name}
-%{_mavenpomdir}/JPP-%{name}.pom
 
 %changelog
 * Tue Aug 06 2013 Pavel Raiskup <praiskup@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
+- merge cleanup changes by Stano Ochotnicky
 
 * Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 9.2.1002-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild