[RabbIT] - Make jar unversioned - bz#1022161

Pavel Alexeev hubbitus at fedoraproject.org
Tue Oct 22 20:35:22 UTC 2013


commit 42bef38cd439ba9b9996bf90277b1144d146cfdb
Author: Pavel Alexeev (aka Pahan-Hubbitus) <pahan at hubbitus.info>
Date:   Wed Oct 23 00:35:15 2013 +0400

    - Make jar unversioned - bz#1022161

 RabbIT.spec |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/RabbIT.spec b/RabbIT.spec
index 9463488..9069b92 100644
--- a/RabbIT.spec
+++ b/RabbIT.spec
@@ -4,7 +4,7 @@ Name:		RabbIT
 %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
 
 Version:		4.11
-Release:		1%{?dist}
+Release:		2%{?dist}
 Summary:		Proxy for a faster web
 Summary(ru):	Прокси для быстрого серфинга в ВЕБе
 #By example of squid
@@ -76,7 +76,7 @@ make %{?_smp_mflags}
 #Make script-wrapper
 cat << HEREDOC > %{name}
 #!/bin/sh
-java -jar %{_javadir}/%{name}-%{version}.jar -f %{_sysconfdir}/%{name}/%{name}.conf
+java -jar %{_javadir}/%{name}.jar -f %{_sysconfdir}/%{name}/%{name}.conf
 HEREDOC
 
 # Author say what it is iso-8859-1
@@ -90,7 +90,7 @@ mv LICENSE.utf-8 LICENSE
 %install
 rm -rf %{buildroot}
 install -d %{buildroot}/%{_javadir}
-install -m644 jars/rabbit4.jar %{buildroot}/%{_javadir}/%{name}-%{version}.jar
+install -m644 jars/rabbit4.jar %{buildroot}/%{_javadir}/%{name}.jar
 install -d %{buildroot}/%{_bindir}
 install -m755 %{name} %{buildroot}/%{_bindir}/%{name}
 
@@ -139,7 +139,7 @@ rm -rf %{buildroot}
 %attr(755,root,root) %{_initrddir}/%{lname}
 %doc ChangeLog README Help.txt LICENSE
 %{_datadir}/%{name}/
-%{_javadir}/%{name}-%{version}.jar
+%{_javadir}/%{name}.jar
 %attr(755,%{lname},root) %{_bindir}/%{name}
 %dir %attr(755,%{lname},root) %{_localstatedir}/log/%{name}
 %attr(755,%{lname},root) %ghost %{_localstatedir}/log/%{name}/main_run.log
@@ -151,6 +151,9 @@ rm -rf %{buildroot}
 %config(noreplace) %{_sysconfdir}/%{name}/users
 
 %changelog
+* Wed Oct 23 2013 Pavel Alexeev <Pahan at Hubbitus.info> - 4.11-2
+- Make jar unversioned - bz#1022161
+
 * Mon Oct 7 2013 Pavel Alexeev <Pahan at Hubbitus.info> - 4.11-1
 - Update to 4.11 to fix badurl (http://www.mail-archive.com/devel@lists.fedoraproject.org/msg67796.html)
 - Rebase patch RabbIT-4.0.fedora-config-path.patch to RabbIT-4.11.fedora-config-path.patch


More information about the scm-commits mailing list