[sblim-cim-client2] Remove versioned jar

vcrhonek vcrhonek at fedoraproject.org
Thu Nov 7 06:36:12 UTC 2013


commit 238139a34f0c292c947c141eb55f6ab439347428
Author: Vitezslav Crhonek <vcrhonek at redhat.com>
Date:   Thu Nov 7 07:36:21 2013 +0100

    Remove versioned jar

 sblim-cim-client2.spec |   13 ++++++-------
 1 files changed, 6 insertions(+), 7 deletions(-)
---
diff --git a/sblim-cim-client2.spec b/sblim-cim-client2.spec
index e578555..4289948 100644
--- a/sblim-cim-client2.spec
+++ b/sblim-cim-client2.spec
@@ -4,7 +4,7 @@
 
 Name:           sblim-cim-client2
 Version:        2.2.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Java CIM Client library
 
 Group:          Development/Libraries
@@ -87,11 +87,7 @@ install -d $confDir
 install --mode=664 sblim-cim-client2.properties sblim-slp-client2.properties $confDir
 # --- jar ---
 install -d $RPM_BUILD_ROOT%{_javadir}
-install %{archive_folder}/lib/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
-(
-  cd $RPM_BUILD_ROOT%{_javadir} &&
-    ln -sf %{name}-%{version}.jar %{name}.jar;
-)
+install %{archive_folder}/lib/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
 # --- javadoc ---
 install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 cp -pr %{archive_folder}/doc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
@@ -106,7 +102,6 @@ cp -pr %{archive_folder}/doc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 %doc %{_pkgdocdir}/ChangeLog
 %doc %{_pkgdocdir}/NEWS
 %{_javadir}/%{name}.jar
-%{_javadir}/%{name}-%{version}.jar
 
 %files javadoc
 %{_javadocdir}/%{name}
@@ -117,6 +112,10 @@ cp -pr %{archive_folder}/doc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
 
 %changelog
+* Thu Nov 07 2013 Vitezslav Crhonek <vcrhonek at redhat.com> - 2.2.4-2
+- Remove versioned jars from %%{_javadir}
+  Resolves: #1022162
+
 * Mon Sep 16 2013 Vitezslav Crhonek <vcrhonek at redhat.com> - 2.2.4-1
 - Update to sblim-cim-client2-2.2.4
 


More information about the scm-commits mailing list