[electric] Remove version from JAR name
Mikolaj Izdebski
mizdebsk at fedoraproject.org
Tue Mar 25 13:20:30 UTC 2014
commit 66593a7bc647726d234e0b54409c503c8c08985a
Author: Michael Simacek <msimacek at redhat.com>
Date: Tue Mar 25 10:52:31 2014 +0100
Remove version from JAR name
Signed-off-by: Michael Simacek <msimacek at redhat.com>
Signed-off-by: Mikolaj Izdebski <mizdebsk at redhat.com>
electric.spec | 28 ++++++++--------------------
1 files changed, 8 insertions(+), 20 deletions(-)
---
diff --git a/electric.spec b/electric.spec
index a599a7a..f49fdb9 100644
--- a/electric.spec
+++ b/electric.spec
@@ -1,9 +1,8 @@
Name: electric
Version: 8.09
-Release: 7%{?dist}
+Release: 8%{?dist}
Summary: Sophisticated ASIC and MEM CAD System
-Group: Applications/Engineering
License: GPLv3
URL: http://www.staticfreesoft.com/
@@ -11,8 +10,6 @@ Source0: ftp://ftp.gnu.org/pub/gnu/electric/%{name}-%{version}.jar
Source1: %{name}.desktop
Source2: %{name}.1
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
BuildRequires: java-devel
BuildRequires: ant
BuildRequires: desktop-file-utils
@@ -31,9 +28,6 @@ and electro-mechanical hybrid layout.
%package javadoc
Summary: Javadocs for %{name}
-Group: Documentation
-Requires: %{name} = %{version}-%{release}
-Requires: jpackage-utils
%description javadoc
@@ -57,22 +51,19 @@ ant -verbose \
%install
-%{__rm} -rf %{buildroot}
-
-
# generating empty directories
install -d %{buildroot}%{_bindir}
install -d %{buildroot}%{_javadir}/%{name}
# real java binary created by this spec file
install -pm 0755 %{name}-%{version}.jar \
- %{buildroot}%{_javadir}/%{name}/%{name}-%{version}.jar
+ %{buildroot}%{_javadir}/%{name}/%{name}.jar
-# dummy executable file to call %%{name}-%%{version}.jar
+# dummy executable file to call %%{name}.jar
cat > %{name} << EOF
#!/bin/bash
-java -jar %{_javadir}/%{name}/%{name}-%{version}.jar
+java -jar %{_javadir}/%{name}/%{name}.jar
EOF
install -pm 0755 %{name} %{buildroot}%{_bindir}/%{name}
@@ -94,26 +85,23 @@ install -d %{buildroot}%{_javadocdir}/%{name}
%{__cp} -rp apidoc/* %{buildroot}%{_javadocdir}/%{name}
-%clean
-%{__rm} -rf %{buildroot}
-
-
%files
-%defattr(-,root,root,-)
%doc packaging/README.txt ChangeLog.txt packaging/LicenseGNU.txt
%{_bindir}/%{name}
%dir %{_javadir}/%{name}/
-%{_javadir}/%{name}/%{name}-%{version}.jar
+%{_javadir}/%{name}/%{name}.jar
%{_datadir}/applications/%{name}.desktop
%{_datadir}/pixmaps/%{name}.png
%{_mandir}/man1/%{name}.1.gz
%files javadoc
-%defattr(-,root,root,-)
%{_javadocdir}/%{name}
%changelog
+* Tue Mar 25 2014 Michael Simacek <msimacek at redhat.com> - 8.09-8
+- Remove version from JAR name
+
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 8.09-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
More information about the scm-commits
mailing list