[automaton] Upgrade to 1.11-8. Drop clean at start of %install, and %defattr. Update BuildRequires and Requires.
Jerry James
jjames at fedoraproject.org
Mon Sep 19 17:21:37 UTC 2011
commit 9f26910b00e3ad0fbc2fea35bbfe247ed17fdce8
Author: Jerry James <loganjerry at gmail.com>
Date: Mon Sep 19 11:20:46 2011 -0600
Upgrade to 1.11-8.
Drop clean at start of %install, and %defattr.
Update BuildRequires and Requires.
.gitignore | 2 +-
automaton.spec | 20 ++++++++++++--------
sources | 2 +-
3 files changed, 14 insertions(+), 10 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index bc3f4a1..e7ace8a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-automaton-1.11-7.tar.gz
+/automaton-1.11-8.tar.gz
diff --git a/automaton.spec b/automaton.spec
index b420523..aa26e5c 100644
--- a/automaton.spec
+++ b/automaton.spec
@@ -1,6 +1,6 @@
# Upstream uses version-release. Control the madness here.
%global upver 1.11
-%global uprel 7
+%global uprel 8
%global filever %{upver}-%{uprel}
Name: automaton
@@ -13,8 +13,11 @@ License: BSD
URL: http://www.brics.dk/automaton/
Source: http://www.brics.dk/~amoeller/%{name}/%{name}-%{filever}.tar.gz
-BuildRequires: ant, java-1.6.0-openjdk-devel, jpackage-utils
-Requires: java, jpackage-utils
+BuildRequires: ant
+BuildRequires: java-devel >= 1:1.6.0
+BuildRequires: jpackage-utils
+Requires: java
+Requires: jpackage-utils
BuildArch: noarch
@@ -32,7 +35,7 @@ symbolic representation based on intervals of Unicode characters.
Summary: A Java finite state automata/regular expression library
Group: Development/Documentation
BuildArch: noarch
-Requires: %{name} = %{version}-%{release}, jpackage-utils
+Requires: %{name} = %{version}-%{release}
%description javadoc
Javadoc documentation for automaton.
@@ -45,8 +48,6 @@ rm -f dist/automaton.jar
ant all
%install
-rm -rf $RPM_BUILD_ROOT
-
mkdir -p $RPM_BUILD_ROOT%{_javadir}
cp -p dist/automaton.jar $RPM_BUILD_ROOT%{_javadir}/automaton-%{version}.jar
ln -s automaton-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/automaton.jar
@@ -56,15 +57,18 @@ mv doc $RPM_BUILD_ROOT%{_javadocdir}/automaton-%{version}
ln -s automaton-%{version} $RPM_BUILD_ROOT%{_javadocdir}/automaton
%files
-%defattr(-,root,root,-)
%doc ChangeLog COPYING README
%{_javadir}/automaton*.jar
%files javadoc
-%defattr(-,root,root,-)
%{_javadocdir}/automaton*
%changelog
+* Mon Sep 19 2011 Jerry James <loganjerry at gmail.com> - 1.11r%{uprel}-1
+- Upgrade to 1.11-8
+- Drop clean at start of %%install and %%defattr
+- Update BuildRequires and Requires
+
* Wed Mar 30 2011 Jerry James <loganjerry at gmail.com> - 1.11r7-1
- Upgrade to 1.11-7
diff --git a/sources b/sources
index 6169dfd..ecffa88 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a5f2ea384d38f5b44bf5f664f34b21ab automaton-1.11-7.tar.gz
+52360fb371c1c0810cf714cbb2ad8008 automaton-1.11-8.tar.gz
More information about the scm-commits
mailing list