Hello community, here is the log from the commit of package regexp for openSUSE:Factory checked in at 2013-08-25 13:32:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/regexp (Old) and /work/SRC/openSUSE:Factory/.regexp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "regexp" Changes: -------- --- /work/SRC/openSUSE:Factory/regexp/regexp.changes 2011-09-23 12:44:09.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.regexp.new/regexp.changes 2013-08-25 13:32:26.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Aug 23 11:13:04 UTC 2013 - [email protected] + +- disable javadoc build + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ regexp.spec ++++++ --- /var/tmp/diff_new_pack.HWoHoC/_old 2013-08-25 13:32:27.000000000 +0200 +++ /var/tmp/diff_new_pack.HWoHoC/_new 2013-08-25 13:32:27.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package regexp (Version 1.5) +# spec file for package regexp # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2000-2008, JPackage Project # All rights reserved. # @@ -16,16 +16,15 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - -# norootforbuild # icecream 0 + %define full_name jakarta-%{name} %define section free Name: regexp Version: 1.5 -Release: 1 +Release: 0 Summary: Simple regular expressions API License: Apache-2.0 Group: Development/Libraries/Java @@ -42,7 +41,9 @@ #!BuildIgnore: xml-commons-jaxp-1.3-apis BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: ant java-1_5_0-gcj-compat-devel xml-commons-apis-bootstrap +BuildRequires: ant +BuildRequires: java-1_5_0-gcj-compat-devel +BuildRequires: xml-commons-apis-bootstrap %description Regexp is a 100% Pure Java Regular Expression package that was @@ -52,26 +53,6 @@ documentation as well as a simple Applet for visual debugging and testing suite for compatibility. - - -%package javadoc -License: Apache-2.0 -PreReq: coreutils -Group: Development/Libraries/Java -Summary: Javadoc for regexp - -%description javadoc -Regexp is a 100% Pure Java Regular Expression package that was -graciously donated to the Apache Software Foundation by Jonathan Locke. -He originally wrote this software back in 1996 and it has stood up -quite well to the test of time. It includes complete Javadoc -documentation as well as a simple Applet for visual debugging and -testing suite for compatibility. - -This package contains the javadoc documentation for regexp. - - - %prep %setup -q -n %{full_name}-%{version} # remove all binary libs @@ -81,37 +62,24 @@ export OPT_JAR_LIST=: export CLASSPATH= mkdir lib -ant -Djakarta-site2.dir=. jar javadocs +ant -Djakarta-site2.dir=. jar %install # jars install -d -m 755 $RPM_BUILD_ROOT%{_javadir} install -m 644 build/*.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar (cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done) -# javadoc -install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} -cp -r docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} -ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} [ -d docs/api ] && rm -rf docs/api -# depmap frags -%add_to_maven_depmap %{name} %{name} %{version} JPP %{name} # pom -%{__mkdir_p} %{buildroot}%{_datadir}/maven2/poms -%{__install} -p -m 0644 %{SOURCE1} %{buildroot}%{_datadir}/maven2/poms/JPP-%{name}.pom - -%clean -rm -rf $RPM_BUILD_ROOT +%{__mkdir_p} %{buildroot}%{_mavenpomdir} +%{__install} -p -m 0644 %{SOURCE1} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom +%add_maven_depmap JPP-%{name}.pom %{name}.jar %files %defattr(0644,root,root,0755) %doc LICENSE %{_javadir}/*.jar -%{_datadir}/maven2/poms/* +%{_mavenpomdir}/* %{_mavendepmapfragdir}/* -%files javadoc -%defattr(0644,root,root,0755) -%{_javadocdir}/%{name}-%{version} -%{_javadocdir}/%{name} - %changelog -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
