rpms/jline/devel import.log,NONE,1.1 jline.spec,1.7,1.8
Peter Lemenkov
peter at fedoraproject.org
Mon Mar 8 09:11:58 UTC 2010
Author: peter
Update of /cvs/pkgs/rpms/jline/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10690/devel
Modified Files:
jline.spec
Added Files:
import.log
Log Message:
Added missing requires
--- NEW FILE import.log ---
jline-0_9_94-0_6_fc12:HEAD:jline-0.9.94-0.6.fc12.src.rpm:1268039460
Index: jline.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jline/devel/jline.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- jline.spec 12 Jan 2010 20:45:11 -0000 1.7
+++ jline.spec 8 Mar 2010 09:11:58 -0000 1.8
@@ -38,7 +38,7 @@
Name: jline
Version: 0.9.94
-Release: 0.5%{?dist}
+Release: 0.6%{?dist}
Epoch: 0
Summary: Java library for reading and editing user input in console applications
License: BSD
@@ -50,6 +50,7 @@ Source2: jline-build.xml
Requires: bash
# for /bin/stty
Requires: coreutils
+Requires: jpackage-utils
BuildRequires: jpackage-utils >= 0:1.7
%if %{with_maven}
BuildRequires: xml-commons-resolver
@@ -84,12 +85,13 @@ Group: Development/Documentatio
%description demo
Demonstrations and samples for %{name}.
-# FIXME: the maven ant:ant generated build.xml file does not contain
+# FIXME: the maven ant:ant generated build.xml file does not contain
# a javadoc task
%if %{with_maven}
%package javadoc
Summary: Javadoc for %{name}
Group: Development/Documentation
+Requires: jpackage-utils
%description javadoc
Javadoc for %{name}.
@@ -130,7 +132,7 @@ mvn-jpp \
mkdir -p $(pwd)/.m2/repository
build-jar-repository $(pwd)/.m2/repository junit
export CLASSPATH=target/classes
-ant -Dbuild.sysclasspath="only" -Duser.home=$(pwd)
+ant -Dbuild.sysclasspath="only" -Duser.home=$(pwd)
%endif
%install
@@ -151,7 +153,7 @@ for target in $(find -type d -name targe
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/`basename \`dirname $target\` | sed -e s:jline-::g`
cp -pr $target/site/apidocs/* $jar $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/`basename \`dirname $target\` | sed -e s:jline-::g`
done
-ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
%endif
%clean
@@ -171,6 +173,9 @@ rm -rf $RPM_BUILD_DIR/META-INF
%endif
%changelog
+* Mon Mar 8 2010 Peter Lemenkov <lemenkov at gmail.com> - 0:0.9.94-0.6
+- Added missing Requires: jpackage-utils (%%{_javadir} and %%{_javadocdir})
+
* Tue Jan 12 2010 Alexander Kurtakov <akurtako at redhat.com> 0:0.9.94-0.5
- Fix BRs.
- Drop gcj_support.
More information about the scm-commits
mailing list