[svnkit] Fix pom name.

[Alexander Kurtakov]

commit 6cb5864350ef0f7d0a058588fa73a3e08afc8bac
Author: Alexander Kurtakov <akurtako at redhat.com>
Date:   Mon Dec 13 17:32:29 2010 +0200

    Fix pom name.
    
    Adapt to current guidelines.

 svnkit.spec |   34 ++++++++++++----------------------
 1 files changed, 12 insertions(+), 22 deletions(-)
---
diff --git a/svnkit.spec b/svnkit.spec
index d058ec7..b58ea1b 100644
--- a/svnkit.spec
+++ b/svnkit.spec
@@ -13,7 +13,7 @@
 
 Name:           svnkit
 Version:        1.3.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Pure Java Subversion client library
 
 Group:          Development/Tools
@@ -28,8 +28,6 @@ Source1:        http://repo1.maven.org/maven2/org/tmatesoft/svnkit/svnkit/%{vers
 Patch0:         svnkit-1.3.3-dependencies.patch
 Patch1:         svnkit-1.3.3-ISVNStatusFileProvider.patch
 
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
 BuildArch:      noarch
 
 BuildRequires:          ant
@@ -124,16 +122,15 @@ rm -rf $RPM_BUILD_ROOT
 
 # jar
 install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
-install -m 644 build/lib/%{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
-install -m 644 build/lib/%{name}-javahl.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-javahl-%{version}.jar
+install -m 644 build/lib/%{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
+install -m 644 build/lib/%{name}-javahl.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-javahl.jar
 
-install -Dm 644 %{SOURCE1} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.svnkit.pom
+install -Dm 644 %{SOURCE1} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-svnkit.pom
 %add_to_maven_depmap org.tmatesoft.svnkit %{name} %{version} JPP %{name}
 
 # javadoc
-mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -pr doc/javadoc/* \
-  $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+cp -pr doc/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
 # eclipse
 mkdir -p $RPM_BUILD_ROOT%{local_dropins}
@@ -149,12 +146,6 @@ rm -f $RPM_BUILD_ROOT%{jna_plugin_dir}/jna.jar
 rm -fR $RPM_BUILD_ROOT%{jna_plugin_dir}/com
 rm -f $RPM_BUILD_ROOT%{core_plugin_dir}/{svnkitsrc.zip,trilead.jar,svnkit.jar,svnkit-javahl.jar,sqljet.1.0.1.jar,antlr-runtime-3.1.3.jar}
 
-# main library links
-pushd $RPM_BUILD_ROOT%{_javadir}/
-ln -s %{name}-%{version}.jar %{name}.jar
-ln -s %{name}-javahl-%{version}.jar %{name}-javahl.jar
-popd
-
 # We need to setup the symlink because the ant copy task doesn't preserve symlinks
 # TODO file a bug about this
 ln -s %{_javadir}/svn-javahl.jar $RPM_BUILD_ROOT%{core_plugin_dir}
@@ -165,9 +156,6 @@ ln -s %{_javadir}/sqljet.jar $RPM_BUILD_ROOT%{core_plugin_dir}/sqljet.1.0.1.jar
 ln -s %{_javadir}/antlr3.jar $RPM_BUILD_ROOT%{core_plugin_dir}/antlr-runtime-3.1.3.jar
 
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %post
 %update_maven_depmap
 
@@ -178,13 +166,11 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root)
 %{_mavenpomdir}
 %{_mavendepmapdir}
-%{_javadir}/%{name}-%{version}.jar
 %{_javadir}/%{name}.jar
 %doc README.txt changelog.txt
 
 %files javahl
 %defattr(-,root,root)
-%{_javadir}/%{name}-javahl-%{version}.jar
 %{_javadir}/%{name}-javahl.jar
 
 %files -n eclipse-svnkit
@@ -193,11 +179,15 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %files javadoc
-%defattr(0644,root,root,0755)
-%{_javadocdir}/%{name}-%{version}
+%defattr(-,root,root,-)
+%{_javadocdir}/%{name}
 
 
 %changelog
+* Mon Dec 13 2010 Alexander Kurtakov <akurtako at redhat.com> 1.3.4-2
+- Fix pom name.
+- Adapt to current guidelines.
+
 * Thu Oct 21 2010 Alexander Kurtakov <akurtako at redhat.com> 1.3.4-1
 - Update to new upstream 1.3.4.