commit 8cd396bdbc0061e655f4fd713d8c0aca122d68c7
Author: Terje Røsten <terje.rosten at ntnu.no>
Date: Tue Oct 22 18:19:36 2013 +0200
Switch to unversioned jar (bz #1022093)
ditaa.spec | 22 ++++++++--------------
1 files changed, 8 insertions(+), 14 deletions(-)
---
diff --git a/ditaa.spec b/ditaa.spec
index 9adc9c4..7fb7bd2 100644
--- a/ditaa.spec
+++ b/ditaa.spec
@@ -4,7 +4,7 @@
Summary: Diagrams Through ASCII Art
Name: ditaa
Version: 0.9
-Release: 10.r%{svn}%{?dist}
+Release: 11.r%{svn}%{?dist}
Group: Applications/System
License: GPLv2+
URL: http://ditaa.sourceforge.net/
@@ -16,7 +16,6 @@ URL: http://ditaa.sourceforge.net/
Source0: ditaa-0.9.r%{svn}.tar.xz
Source1: ditaa.wrapper
Patch0: ditaa-0.9-batik-png.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
BuildRequires: java-devel >= 1:1.6.0
BuildRequires: ant
@@ -45,28 +44,23 @@ find -name '*.class' -delete
find -name '*.jar' -delete
%build
-%{__install} -d bin
+install -d bin
build-jar-repository -s -p lib commons-cli batik-all xml-commons-apis-ext jericho-html
ant -f build/release.xml
%install
-%{__rm} -rf %{buildroot}
-%{__install} -D -p -m 0644 releases/%{name}%{over}.jar \
- %{buildroot}%{_javadir}/%{name}-%{version}.jar
-%{__ln_s} %{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
-%{__install} -D -p -m 0755 %{SOURCE1} %{buildroot}%{_bindir}/%{name}
-
-%clean
-%{__rm} -rf %{buildroot}
+install -D -p -m 0644 releases/%{name}%{over}.jar %{buildroot}%{_javadir}/%{name}.jar
+install -D -p -m 0755 %{SOURCE1} %{buildroot}%{_bindir}/%{name}
%files
-%defattr(-, root, root, -)
%doc COPYING HISTORY
%{_bindir}/%{name}
-%{_javadir}/%{name}-%{version}.jar
%{_javadir}/%{name}.jar
%changelog
+* Tue Oct 22 2013 Terje Rosten <terje.rosten at ntnu.no> - 0.9-11.r74
+- Switch to unversioned jar (bz #1022093)
+
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9-10.r74
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
@@ -88,7 +82,7 @@ ant -f build/release.xml
* Mon Jul 26 2010 Terje Rosten <terje.rosten at ntnu.no> - 0.9-4.r74
- Pull sources from svn do get working ditaa using system jericho
-* Wed Jun 22 2010 Terje Rosten <terje.rosten at ntnu.no> - 0.9-3
+* Tue Jun 22 2010 Terje Rosten <terje.rosten at ntnu.no> - 0.9-3
- Use system jericho-html
* Mon Jun 21 2010 Terje Rosten <terje.rosten at ntnu.no> - 0.9-2