diff --git a/jline.changes b/jline.changes index 57e4a5c..9fb118c 100644 --- a/jline.changes +++ b/jline.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Aug 26 07:57:51 UTC 2013 - mvyskocil@suse.com + +- use new add_maven_depmap from javapackages-utils + ------------------------------------------------------------------- Thu Apr 25 09:21:43 UTC 2013 - mvyskocil@suse.com diff --git a/jline.spec b/jline.spec index 5639b04..1ccc78a 100644 --- a/jline.spec +++ b/jline.spec @@ -84,17 +84,6 @@ chain to other console applications. -%package javadoc -Summary: Java library for reading and editing user input in console applications -Group: Development/Libraries/Java - -%description javadoc -JLine is a java library for reading and editing user input in console -applications. It features tab-completion, command history, password -masking, customizable keybindings, and pass-through handlers to use to -chain to other console applications. - - %prep # BEWARE: The jar file META-INF is not under the subdir @@ -126,7 +115,7 @@ mvn-jpp \ %else export CLASSPATH=`pwd`/target/classes:`pwd`/target/test-classes export OPT_JAR_LIST=: -ant jar javadoc +ant jar %endif %install @@ -134,34 +123,16 @@ ant jar javadoc install -d -m 755 $RPM_BUILD_ROOT%{_javadir} install -p -m 644 src/target/jline.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar (cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} ${jar/-%{version}/}; done) -%add_to_maven_depmap %{name} %{name} %{version} JPP %{name} -# poms -install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms -install -p -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}.pom -# javadoc -install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} -cp -pr src/target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/ -ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} -%clean -rm -rf $RPM_BUILD_ROOT - -%post -%update_maven_depmap - -%postun -%update_maven_depmap +# pom +install -pD -T -m 644 %{SOURCE3} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom +%add_maven_depmap JPP-%{name}.pom %{name}.jar %files %defattr(0644,root,root,0755) %{_javadir}/%{name}.jar %{_javadir}/%{name}-%{version}.jar -%{_datadir}/maven2/poms/* %config %{_mavendepmapfragdir}/* - -%files javadoc -%defattr(0644,root,root,0755) -%{_javadocdir}/%{name}-%{version} -%{_javadocdir}/%{name} +%{_mavenpomdir}/* %changelog