May 2017 - openSUSE Commits - openSUSE Mailing Lists

commit slf4j for openSUSE:Factory
by root＠hilbert.suse.de 31 May '17

31 May '17

Hello community, here is the log from the commit of package slf4j for openSUSE:Factory checked in at 2017-05-31 13:30:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/slf4j (Old) and /work/SRC/openSUSE:Factory/.slf4j.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "slf4j" Wed May 31 13:30:45 2017 rev:12 rq:496822 version:1.7.12 Changes: -------- --- /work/SRC/openSUSE:Factory/slf4j/slf4j.changes 2015-11-12 19:35:19.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.slf4j.new/slf4j.changes 2017-05-31 13:30:49.107258564 +0200 @@ -1,0 +2,5 @@ +Fri May 19 16:49:25 UTC 2017 - tchvatal(a)suse.com + +- Remove some not-needed deps + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ slf4j.spec ++++++ --- /var/tmp/diff_new_pack.wByqio/_old 2017-05-31 13:30:50.071122703 +0200 +++ /var/tmp/diff_new_pack.wByqio/_new 2017-05-31 13:30:50.075122140 +0200 @@ -1,9 +1,8 @@ # # spec file for package slf4j # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2000-2009, JPackage Project -# All rights reserved. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -28,9 +27,6 @@ Source0: http://www.slf4j.org/dist/%{name}-%{version}.tar.gz Source1: build.xml.tar.bz2 Patch1: build-remove-slf4j_api-binder.patch - -Requires(post): javapackages-tools -Requires(postun): javapackages-tools BuildRequires: ant >= 1.6.5 BuildRequires: ant-junit >= 1.6.5 BuildRequires: apache-commons-lang @@ -43,12 +39,11 @@ BuildRequires: log4j-mini Requires: cal10n Requires: java -Requires: javapackages-tools # this is ugly hack, which creates package wich requires the same, # however slf4j is not splitted between -api and -impl, but pom files are modeled as it was Provides: osgi(slf4j.api) -BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildArch: noarch %description The Simple Logging Facade for Java or (SLF4J) is intended to serve @@ -65,7 +60,6 @@ %package javadoc Summary: Javadoc for %{name} Group: Documentation/HTML -Requires: javapackages-tools %description javadoc API documentation for %{name}. @@ -86,7 +80,7 @@ sed -i -e "s|ant<|org.apache.ant<|g" integration/pom.xml %{_bindir}/find -name "*.css" -o -name "*.js" -o -name "*.txt" | \ - %{_bindir}/xargs -t %{__perl} -pi -e 's/\r$//g' + %{_bindir}/xargs -t perl -pi -e 's/\r$//g' # The general pattern is that the API package exports API classes and does # # not require impl classes. slf4j was breaking that causing "A cycle was @@ -112,40 +106,40 @@ %install # jars -install -d -m 0755 $RPM_BUILD_ROOT%{_javadir}/%{name} +install -d -m 0755 %{buildroot}%{_javadir}/%{name} install -m 644 jcl-over-slf4j/target/jcl-over-slf4j-%{version}.jar \ - $RPM_BUILD_ROOT%{_javadir}/%{name}/jcl-over-slf4j.jar + %{buildroot}%{_javadir}/%{name}/jcl-over-slf4j.jar install -m 644 jul-to-slf4j/target/jul-to-slf4j-%{version}.jar \ - $RPM_BUILD_ROOT%{_javadir}/%{name}/jul-to-slf4j.jar + %{buildroot}%{_javadir}/%{name}/jul-to-slf4j.jar install -m 644 log4j-over-slf4j/target/log4j-over-slf4j-%{version}.jar \ - $RPM_BUILD_ROOT%{_javadir}/%{name}/log4j-over-slf4j.jar + %{buildroot}%{_javadir}/%{name}/log4j-over-slf4j.jar install -m 644 slf4j-api/target/%{name}-api-%{version}.jar \ - $RPM_BUILD_ROOT%{_javadir}/%{name}/api.jar + %{buildroot}%{_javadir}/%{name}/api.jar install -m 644 slf4j-ext/target/%{name}-ext-%{version}.jar \ - $RPM_BUILD_ROOT%{_javadir}/%{name}/ext.jar + %{buildroot}%{_javadir}/%{name}/ext.jar install -m 644 slf4j-jcl/target/%{name}-jcl-%{version}.jar \ - $RPM_BUILD_ROOT%{_javadir}/%{name}/jcl.jar + %{buildroot}%{_javadir}/%{name}/jcl.jar install -m 644 slf4j-jdk14/target/%{name}-jdk14-%{version}.jar \ - $RPM_BUILD_ROOT%{_javadir}/%{name}/jdk14.jar + %{buildroot}%{_javadir}/%{name}/jdk14.jar install -m 644 slf4j-log4j12/target/%{name}-log4j12-%{version}.jar \ - $RPM_BUILD_ROOT%{_javadir}/%{name}/log4j12.jar + %{buildroot}%{_javadir}/%{name}/log4j12.jar install -m 644 slf4j-migrator/target/%{name}-migrator-%{version}.jar \ - $RPM_BUILD_ROOT%{_javadir}/%{name}/migrator.jar + %{buildroot}%{_javadir}/%{name}/migrator.jar install -m 644 slf4j-nop/target/%{name}-nop-%{version}.jar \ - $RPM_BUILD_ROOT%{_javadir}/%{name}/nop.jar + %{buildroot}%{_javadir}/%{name}/nop.jar install -m 644 slf4j-simple/target/%{name}-simple-%{version}.jar \ - $RPM_BUILD_ROOT%{_javadir}/%{name}/simple.jar + %{buildroot}%{_javadir}/%{name}/simple.jar # manual -install -d -m 0755 $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} +install -d -m 0755 %{buildroot}%{_docdir}/%{name}-%{version} rm -f target/site/.htaccess -cp -pr target/site $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/ -install -m 644 LICENSE.txt $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/ +cp -pr target/site %{buildroot}%{_docdir}/%{name}-%{version}/ +install -m 644 LICENSE.txt %{buildroot}%{_docdir}/%{name}-%{version}/ # javadoc -install -d -m 0755 $RPM_BUILD_ROOT%{_javadocdir}/%{name} -cp -pr target/site/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}/ +install -d -m 0755 %{buildroot}%{_javadocdir}/%{name} +cp -pr target/site/* %{buildroot}%{_javadocdir}/%{name}/ rm -rf target/site %files

1 0

commit xerces-j2 for openSUSE:Factory
by root＠hilbert.suse.de 31 May '17

31 May '17

Hello community, here is the log from the commit of package xerces-j2 for openSUSE:Factory checked in at 2017-05-31 13:30:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xerces-j2 (Old) and /work/SRC/openSUSE:Factory/.xerces-j2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xerces-j2" Wed May 31 13:30:35 2017 rev:38 rq:496817 version:2.11.0 Changes: -------- --- /work/SRC/openSUSE:Factory/xerces-j2/xerces-j2.changes 2016-02-17 12:26:22.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.xerces-j2.new/xerces-j2.changes 2017-05-31 13:30:35.329200637 +0200 @@ -1,0 +2,5 @@ +Fri May 19 16:31:01 UTC 2017 - tchvatal(a)suse.com + +- BuildIgnore more main java versions to stick to gcj + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xerces-j2.spec ++++++ --- /var/tmp/diff_new_pack.MjhAtD/_old 2017-05-31 13:30:36.093092963 +0200 +++ /var/tmp/diff_new_pack.MjhAtD/_new 2017-05-31 13:30:36.097092400 +0200 @@ -1,7 +1,7 @@ # # spec file for package xerces-j2 # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -37,6 +37,9 @@ # some build requirements removed to enable jpackage bootstrap. this is # the first package built, and we use the libraries in the tools subdir # for it. +#!BuildIgnore: java-9-openjdk java-9-openjdk-devel +#!BuildIgnore: java-1_8_0-openjdk java-1_8_0-openjdk-devel +#!BuildIgnore: java-1_7_0-openjdk java-1_7_0-openjdk-devel #!BuildIgnore: java-1_6_0-openjdk java-1_6_0-openjdk-devel #!BuildIgnore: antlr antlr-java BuildRequires: java-1_5_0-gcj-compat-devel @@ -99,7 +102,6 @@ Summary: Additional utility scripts for xerces-j2 Group: Development/Libraries/Java Requires: %{name} = %{version} -Requires: javapackages-tools %description scripts Welcome to the future! Xerces2 is the next generation of high @@ -126,7 +128,6 @@ %package xml-resolver Summary: Resolver subproject of xml-commons Group: Development/Libraries/Java -Requires: javapackages-tools Requires(post): update-alternatives Requires(pre): update-alternatives Provides: xml-commons-resolver @@ -142,7 +143,6 @@ %package xml-apis Summary: APIs subproject of xml-commons Group: Development/Libraries/Java -Requires: javapackages-tools Requires(post): update-alternatives Requires(pre): update-alternatives Provides: xml-commons-apis

1 0

commit xml-commons for openSUSE:Factory
by root＠hilbert.suse.de 31 May '17

31 May '17

Hello community, here is the log from the commit of package xml-commons for openSUSE:Factory checked in at 2017-05-31 13:30:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xml-commons (Old) and /work/SRC/openSUSE:Factory/.xml-commons.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xml-commons" Wed May 31 13:30:27 2017 rev:38 rq:496816 version:1.4.01 Changes: -------- --- /work/SRC/openSUSE:Factory/xml-commons/xml-commons-apis-bootstrap.changes 2015-03-18 12:59:39.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.xml-commons.new/xml-commons-apis-bootstrap.changes 2017-05-31 13:30:29.478025383 +0200 @@ -1,0 +2,6 @@ +Fri May 19 11:40:41 UTC 2017 - vsistek(a)suse.com + +- Add BuildRequires: javapackages-local (for maven conversions) +- .spec file cleanup + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/xml-commons/xml-commons.changes 2015-04-02 15:59:34.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xml-commons.new/xml-commons.changes 2017-05-31 13:30:30.193924474 +0200 @@ -1,0 +2,6 @@ +Fri May 19 11:39:11 UTC 2017 - vsistek(a)suse.com + +- Add BuildRequires: javapackages-local (for maven conversions) +- .spec file cleanup + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xml-commons-apis-bootstrap.spec ++++++ --- /var/tmp/diff_new_pack.Lpaeg1/_old 2017-05-31 13:30:32.453605964 +0200 +++ /var/tmp/diff_new_pack.Lpaeg1/_new 2017-05-31 13:30:32.457605400 +0200 @@ -2,7 +2,7 @@ # # spec file for package xml-commons-apis-bootstrap # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -22,7 +22,6 @@ %define apis_jar %{real_name}-apis-bootstrap %define which_jar %{real_name}-which-bootstrap %define resolver_jar %{real_name}-resolver-bootstrap - Name: xml-commons-apis-bootstrap Version: 1.4.01 Release: 0 @@ -37,14 +36,15 @@ Patch1: %{real_name}-resolver-crosslink.patch Patch2: %{real_name}-resolver-1.1-build_xml.patch Patch3: %{real_name}-enum.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildArch: noarch -Provides: xml-apis #!BuildIgnore: antlr antlr-java BuildRequires: antlr-bootstrap -BuildRequires: java-1_5_0-gcj-compat-devel #!BuildIgnore: java-1_6_0-openjdk java-1_6_0-openjdk-devel BuildRequires: fastjar +BuildRequires: java-1_5_0-gcj-compat-devel +# Needed for maven conversions +BuildRequires: javapackages-local +Provides: xml-apis +BuildArch: noarch %description This is xml-apis from the java-bootrapping-tools package. DO NOT @@ -68,7 +68,6 @@ This is xml-resolver from the java-bootrapping-tools package. DO NOT INSTALL ... THIS IS JUST FOR PACKAGING & BOOTSTRAPPING JAVA PURPOSES!! - %prep # To make patches unchanged %setup -q -T -c @@ -133,7 +132,7 @@ # uses $TARGET_DIR to move created jar to function mkJar() { find -name "version.txt" -or -name "*.class" -or -name "*.properties" -or -name "*.rsc" -or -name "*manifest*" |\ - xargs /usr/bin/fastjar -m manifest.* -cf ${1}.jar ; + xargs %{_bindir}/fastjar -m manifest.* -cf ${1}.jar ; mv ${1}.jar $TARGET_DIR } #<<< @@ -183,16 +182,12 @@ %install #>>> % install -mkdir -p $RPM_BUILD_ROOT/%{_javadir} -cp %{apis_jar}.jar $RPM_BUILD_ROOT/%{_javadir} -cp %{which_jar}.jar $RPM_BUILD_ROOT/%{_javadir} -cp %{resolver_jar}.jar $RPM_BUILD_ROOT/%{_javadir} +mkdir -p %{buildroot}/%{_javadir} +cp %{apis_jar}.jar %{buildroot}/%{_javadir} +cp %{which_jar}.jar %{buildroot}/%{_javadir} +cp %{resolver_jar}.jar %{buildroot}/%{_javadir} #<<< install end -%clean -rm -rf $RPM_BUILD_ROOT -#>>> files - %files %defattr(-,root,root) %doc xml-commons-1_0_b2/LICENSE.txt ++++++ xml-commons.spec ++++++ --- /var/tmp/diff_new_pack.Lpaeg1/_old 2017-05-31 13:30:32.521596380 +0200 +++ /var/tmp/diff_new_pack.Lpaeg1/_new 2017-05-31 13:30:32.525595816 +0200 @@ -1,9 +1,8 @@ # # spec file for package xml-commons # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2000-2008, JPackage Project -# All rights reserved. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,23 +20,15 @@ # FIXME: workaround for bnc#650905 %define with_repolib 0 %define without_repolib 1 - %define repo %{_javadir}/repository.jboss.com %define repodir %{repo}/apache-xml-commons/1.3.04-brew %define repodirlib %{repodir}/lib %define repodirsrc %{repodir}/src -#%%define resolverrepodir %{repo}/apache-xml-commons-resolver/1.2-brew -#%%define resolverrepodirlib %{repodir}/lib -#%%define resolverrepodirsrc %{repodir}/src - -%define section free %define resolverdir %{_sysconfdir}/java/resolver - # To get around having multiple versions of projects within the same srpm %define apis_version_1_1 1.0.b2 %define apis_version_1_2 1.2.06 %define apis_version_1_3 1.3.05 - Name: xml-commons Version: 1.4.01 Release: 0 @@ -88,18 +79,17 @@ Patch3: %{name}-enum.patch #PATCH-FIX-SUSE: don't call javadoc from any used target Patch4: xml-commons-no-javadoc.patch -Requires: javapackages-tools -Requires(post): javapackages-tools -Requires(postun): javapackages-tools BuildRequires: ant BuildRequires: java-1_5_0-gcj-compat-devel +# Needed for maven conversions +BuildRequires: javapackages-local #!BuildIgnore: java-1_6_0-openjdk java-1_6_0-openjdk-devel #BuildRequires: docbook-style-xsl +BuildRequires: javapackages-tools BuildRequires: xalan-j2 #!BuildIgnore: xml-commons-resolver xml-commons-jaxp-1.3-apis xml-commons #!BuildIgnore: antlr antlr-java BuildArch: noarch -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description xml-commons is focused on common code and guidelines for xml projects. @@ -114,16 +104,15 @@ %package jaxp-1.1-apis Summary: JAXP 1.1, DOM2, SAX2, SAX2-ext 1.0 apis Group: Productivity/Publishing/XML +Requires: %{name} = %{version}-%{release} +Requires(post): update-alternatives +Requires(preun): update-alternatives Provides: dom = 2 Provides: jaxp = 1.1 Provides: sax = 2.0 Provides: xml-commons-apis = %{apis_version_1_1}-%{release} Provides: xslt = 1.0 Obsoletes: xml-commons-apis <= 1.3.02-2jpp -Requires: %{name} = %{version}-%{release} -Requires: javapackages-tools -Requires(preun): update-alternatives -Requires(post): update-alternatives %description jaxp-1.1-apis DOM 2 org.w3c.dom and SAX XML 2.0 org.xml.sax processor apis used @@ -142,14 +131,12 @@ %package which10 Summary: XmlWhich 1.0 utility from %{name} Group: Productivity/Publishing/XML -Provides: xml-commons-which = 1.0 Requires: %{name} = %{version}-%{release} -Requires: ant >= 1.6 -Requires: javapackages-tools Requires: jaxp_parser_impl Requires: xml-commons-jaxp-1.1-apis = %{version}-%{release} -Requires(preun): update-alternatives Requires(post): update-alternatives +Requires(preun): update-alternatives +Provides: xml-commons-which = 1.0 %description which10 @@ -158,13 +145,12 @@ %package resolver10 Summary: XmlResolver 1.0 utility from %{name} Group: Development/Libraries/Java -Provides: xml-commons-resolver = 1.0 Requires: %{name} = %{version}-%{release} -Requires: javapackages-tools Requires: jaxp_parser_impl Requires: xml-commons-jaxp-1.1-apis = %{version}-%{release} -Requires(preun):update-alternatives Requires(post): update-alternatives +Requires(preun): update-alternatives +Provides: xml-commons-resolver = 1.0 %description resolver10 @@ -174,13 +160,12 @@ Summary: XmlResolver 1.1 utility from %{name} Group: Development/Libraries/Java Requires: %{name} = %{version} -Requires: javapackages-tools Requires: jaxp_parser_impl Requires: xml-commons-jaxp-1.2-apis = %{version} +Requires(post): update-alternatives +Requires(preun): update-alternatives Provides: xml-commons-resolver = %{version} Obsoletes: xml-commons-resolver <= 1.3.02 -Requires(preun): update-alternatives -Requires(post): update-alternatives %description resolver11 @@ -189,16 +174,15 @@ %package jaxp-1.2-apis Summary: JAXP 1.2, DOM 2, SAX 2.0.1, SAX2-ext 1.0 apis Group: Productivity/Publishing/XML +Requires: %{name} = %{version}-%{release} +Requires(post): update-alternatives +Requires(preun): update-alternatives Provides: dom = 2 Provides: jaxp = 1.2 Provides: sax = 2.0.1 Provides: xml-commons-apis = %{apis_version_1_2}-%{release} Provides: xslt = 1.0 Obsoletes: xml-commons-apis <= 1.3.02-2jpp -Requires: %{name} = %{version}-%{release} -Requires: javapackages-tools -Requires(preun): update-alternatives -Requires(post): update-alternatives %description jaxp-1.2-apis DOM 2 org.w3c.dom and SAX XML 2.0 org.xml.sax processor apis used @@ -217,16 +201,15 @@ %package jaxp-1.3-apis Summary: JAXP 1.3, DOM 2, SAX 2.0.1, SAX2-ext 1.0 apis Group: Productivity/Publishing/XML +Requires: %{name} = %{version}-%{release} +Requires(post): update-alternatives +Requires(preun): update-alternatives Provides: dom = 3 Provides: jaxp = 1.3 Provides: sax = 2.0.2 Provides: xml-commons-apis = %{version}-%{release} Provides: xslt = 1.0 Obsoletes: xml-commons-apis <= 1.3.02 -Requires: %{name} = %{version}-%{release} -Requires: javapackages-tools -Requires(preun): update-alternatives -Requires(post): update-alternatives %description jaxp-1.3-apis DOM 3 org.w3c.dom and SAX XML 2.0.2 (sax2r3) org.xml.sax @@ -248,16 +231,13 @@ %package which11 Summary: XmlWhich 1.1 from %{name} Group: Productivity/Publishing/XML -#Provides: xml-commons-which = 1.1 -Provides: xml-commons-which = %{version}-%{release} -Obsoletes: xml-commons-which <= 1.3.02 Requires: %{name} = %{version}-%{release} -Requires: ant >= 1.6 -Requires: javapackages-tools Requires: jaxp_parser_impl Requires: xml-commons-jaxp-1.3-apis = %{version}-%{release} -Requires(preun): update-alternatives Requires(post): update-alternatives +Requires(preun): update-alternatives +Provides: xml-commons-which = %{version}-%{release} +Obsoletes: xml-commons-which <= 1.3.02 %description which11 @@ -266,13 +246,12 @@ %package resolver12 Summary: XmlResolver 1.2 from %{name} Group: Productivity/Publishing/XML -Provides: xml-commons-resolver = 1.2 Requires: %{name} = %{version}-%{release} -Requires: javapackages-tools Requires: jaxp_parser_impl Requires: xml-commons-jaxp-1.3-apis = %{version}-%{release} -Requires(preun): update-alternatives Requires(post): update-alternatives +Requires(preun): update-alternatives +Provides: xml-commons-resolver = 1.2 %description resolver12 @@ -281,16 +260,15 @@ %package jaxp-1.4-apis Summary: JAXP 1.4, DOM 2, SAX 2.0.1, SAX2-ext 1.0 apis Group: Productivity/Publishing/XML +Requires: %{name} = %{version}-%{release} +Requires(post): update-alternatives +Requires(preun): update-alternatives Provides: dom = 3 Provides: jaxp = 1.4 Provides: sax = 2.0.2 Provides: xml-commons-apis = %{version}-%{release} Provides: xslt = 1.0 Obsoletes: xml-commons-apis < 1.4.01 -Requires: %{name} = %{version}-%{release} -Requires: javapackages-tools -Requires(preun): update-alternatives -Requires(post): update-alternatives %description jaxp-1.4-apis DOM 3 org.w3c.dom and SAX XML 2.0.2 (sax2r3) org.xml.sax @@ -310,9 +288,7 @@ %{summary}. %if %{with_repolib} - %package repolib - Summary: Artifacts to be uploaded to a repository library Group: Development/Libraries/Java @@ -335,8 +311,6 @@ %patch2 -b .sav %patch3 -b .sav -#quilt import -p1 %{PATCH4} -#quilt push --fuzz=0 %patch4 -p1 # remove all binary libs and prebuilt javadocs @@ -386,42 +360,42 @@ %endif # Jars -install -d -m 755 $RPM_BUILD_ROOT%{_javadir} +install -d -m 755 %{buildroot}%{_javadir} # JAXP11 install -m 644 xml-commons-1_0_b2/java/external/build/xml-apis.jar \ - $RPM_BUILD_ROOT%{_javadir}/%{name}-jaxp-1.1-apis-%{version}.jar + %{buildroot}%{_javadir}/%{name}-jaxp-1.1-apis-%{version}.jar # resolver10 install -m 644 xml-commons-1_0_b2/java/build/resolver.jar \ - $RPM_BUILD_ROOT%{_javadir}/%{name}-resolver10-%{version}.jar + %{buildroot}%{_javadir}/%{name}-resolver10-%{version}.jar # which10 install -m 644 xml-commons-1_0_b2/java/build/which.jar \ - $RPM_BUILD_ROOT%{_javadir}/%{name}-which10-%{version}.jar + %{buildroot}%{_javadir}/%{name}-which10-%{version}.jar # resolver11 install -m 644 xml-commons-resolver-1_1_b1/java/build/resolver.jar \ - $RPM_BUILD_ROOT%{_javadir}/%{name}-resolver11-%{version}.jar + %{buildroot}%{_javadir}/%{name}-resolver11-%{version}.jar # JAXP12 install -m 644 xml-commons-external-1_2_*/java/external/build/xml-apis.jar \ - $RPM_BUILD_ROOT%{_javadir}/%{name}-jaxp-1.2-apis-%{version}.jar + %{buildroot}%{_javadir}/%{name}-jaxp-1.2-apis-%{version}.jar # JAXP13 install -m 644 xml-commons-external-1_3_*/java/external/build/xml-apis.jar \ - $RPM_BUILD_ROOT%{_javadir}/%{name}-jaxp-1.3-apis-%{version}.jar + %{buildroot}%{_javadir}/%{name}-jaxp-1.3-apis-%{version}.jar # JAXP13 ext install -m 644 xml-commons-external-1_3_*/java/external/build/xml-apis-ext.jar \ - $RPM_BUILD_ROOT%{_javadir}/%{name}-jaxp-1.3-apis-ext-%{version}.jar + %{buildroot}%{_javadir}/%{name}-jaxp-1.3-apis-ext-%{version}.jar # resolver12 install -m 644 xml-commons-resolver-1_2/java/build/resolver.jar \ - $RPM_BUILD_ROOT%{_javadir}/%{name}-resolver12-%{version}.jar + %{buildroot}%{_javadir}/%{name}-resolver12-%{version}.jar # which11 install -m 644 xml-commons-resolver-1_2/java/build/which.jar \ - $RPM_BUILD_ROOT%{_javadir}/%{name}-which11-%{version}.jar + %{buildroot}%{_javadir}/%{name}-which11-%{version}.jar # JAXP14 install -m 644 xml-commons-external-1_4_*/java/external/build/xml-apis.jar \ - $RPM_BUILD_ROOT%{_javadir}/%{name}-jaxp-1.4-apis-%{version}.jar + %{buildroot}%{_javadir}/%{name}-jaxp-1.4-apis-%{version}.jar # JAXP14 ext install -m 644 xml-commons-external-1_4_*/java/external/build/xml-apis-ext.jar \ - $RPM_BUILD_ROOT%{_javadir}/%{name}-jaxp-1.4-apis-ext-%{version}.jar + %{buildroot}%{_javadir}/%{name}-jaxp-1.4-apis-ext-%{version}.jar -pushd $RPM_BUILD_ROOT%{_javadir} +pushd %{buildroot}%{_javadir} for jar in *-%{version}*; do ln -sf ${jar} $(echo $jar | sed -e 's|-%{version}\.jar|.jar|'); done @@ -433,107 +407,107 @@ popd # poms -%{__mkdir_p} %{buildroot}%{_mavenpomdir} +mkdir -p %{buildroot}%{_mavenpomdir} apis_tag_1_3=`echo %{apis_version_1_3} | sed -e 's|\.|_|g'` sed -e 's|1\.3\.04|%{apis_version_1_3}|' -e "s|1_3_04|${apis_tag_1_3}|" < %{SOURCE200} \ > %{buildroot}%{_mavenpomdir}/JPP-%{name}-jaxp-1.3-apis.pom -%{__ln_s} JPP-%{name}-jaxp-1.3-apis.pom %{buildroot}%{_mavenpomdir}/JPP-%{name}-apis.pom +ln -s JPP-%{name}-jaxp-1.3-apis.pom %{buildroot}%{_mavenpomdir}/JPP-%{name}-apis.pom %add_maven_depmap JPP-%{name}-jaxp-1.3-apis.pom %{name}-jaxp-1.3-apis.jar sed -e 's|1\.3\.04|%{apis_version_1_3}|' -e "s|1_3_04|${apis_tag_1_3}|" < %{SOURCE201} \ > %{buildroot}%{_mavenpomdir}/JPP-%{name}-jaxp-1.3-apis-ext.pom %add_maven_depmap JPP-%{name}-jaxp-1.3-apis-ext.pom %{name}-jaxp-1.3-apis-ext.jar -%{__cp} -p %{SOURCE202} %{buildroot}%{_mavenpomdir}/JPP-%{name}-jaxp-1.4-apis.pom +cp -p %{SOURCE202} %{buildroot}%{_mavenpomdir}/JPP-%{name}-jaxp-1.4-apis.pom %add_maven_depmap JPP-%{name}-jaxp-1.4-apis.pom %{name}-jaxp-1.4-apis.jar -%{__cp} -p %{SOURCE203} %{buildroot}%{_mavenpomdir}/JPP-%{name}-resolver12.pom +cp -p %{SOURCE203} %{buildroot}%{_mavenpomdir}/JPP-%{name}-resolver12.pom %add_maven_depmap JPP-%{name}-resolver12.pom %{name}-resolver12.jar # Scripts -install -d -m 755 $RPM_BUILD_ROOT%{_bindir} -install -d -m 755 $RPM_BUILD_ROOT%{_mandir}/man1 +install -d -m 755 %{buildroot}%{_bindir} +install -d -m 755 %{buildroot}%{_mandir}/man1 -cp -p %{SOURCE4} $RPM_BUILD_ROOT%{_bindir}/xml-which10 -cp -p %{SOURCE5} $RPM_BUILD_ROOT%{_bindir}/xml-which11 +cp -p %{SOURCE4} %{buildroot}%{_bindir}/xml-which10 +cp -p %{SOURCE5} %{buildroot}%{_bindir}/xml-which11 sed -e 's|__RESOLVERDIR__|%{resolverdir}|' < %{SOURCE7} \ - > $RPM_BUILD_ROOT%{_bindir}/xml-resolver10 + > %{buildroot}%{_bindir}/xml-resolver10 sed -e 's|__RESOLVERDIR__|%{resolverdir}|' < %{SOURCE9} \ - > $RPM_BUILD_ROOT%{_bindir}/xml-xread10 + > %{buildroot}%{_bindir}/xml-xread10 sed -e 's|__RESOLVERDIR__|%{resolverdir}|' < %{SOURCE11} \ - > $RPM_BUILD_ROOT%{_bindir}/xml-xparse10 + > %{buildroot}%{_bindir}/xml-xparse10 sed -e 's|__RESOLVERDIR__|%{resolverdir}|' < %{SOURCE6} \ - > $RPM_BUILD_ROOT%{_mandir}/man1/xml-resolver10.1 + > %{buildroot}%{_mandir}/man1/xml-resolver10.1 sed -e 's|__RESOLVERDIR__|%{resolverdir}|' < %{SOURCE8} \ - > $RPM_BUILD_ROOT%{_mandir}/man1/xml-xread10.1 + > %{buildroot}%{_mandir}/man1/xml-xread10.1 sed -e 's|__RESOLVERDIR__|%{resolverdir}|' < %{SOURCE10} \ - > $RPM_BUILD_ROOT%{_mandir}/man1/xml-xparse10.1 + > %{buildroot}%{_mandir}/man1/xml-xparse10.1 sed -e 's|__RESOLVERDIR__|%{resolverdir}|' < %{SOURCE13} \ - > $RPM_BUILD_ROOT%{_bindir}/xml-resolver11 + > %{buildroot}%{_bindir}/xml-resolver11 sed -e 's|__RESOLVERDIR__|%{resolverdir}|' < %{SOURCE15} \ - > $RPM_BUILD_ROOT%{_bindir}/xml-xread11 + > %{buildroot}%{_bindir}/xml-xread11 sed -e 's|__RESOLVERDIR__|%{resolverdir}|' < %{SOURCE17} \ - > $RPM_BUILD_ROOT%{_bindir}/xml-xparse11 + > %{buildroot}%{_bindir}/xml-xparse11 sed -e 's|__RESOLVERDIR__|%{resolverdir}|' < %{SOURCE12} \ - > $RPM_BUILD_ROOT%{_mandir}/man1/xml-resolver11.1 + > %{buildroot}%{_mandir}/man1/xml-resolver11.1 sed -e 's|__RESOLVERDIR__|%{resolverdir}|' < %{SOURCE14} \ - > $RPM_BUILD_ROOT%{_mandir}/man1/xml-xread11.1 + > %{buildroot}%{_mandir}/man1/xml-xread11.1 sed -e 's|__RESOLVERDIR__|%{resolverdir}|' < %{SOURCE16} \ - > $RPM_BUILD_ROOT%{_mandir}/man1/xml-xparse11.1 + > %{buildroot}%{_mandir}/man1/xml-xparse11.1 sed -e 's|__RESOLVERDIR__|%{resolverdir}|' < %{SOURCE19} \ - > $RPM_BUILD_ROOT%{_bindir}/xml-resolver12 + > %{buildroot}%{_bindir}/xml-resolver12 sed -e 's|__RESOLVERDIR__|%{resolverdir}|' < %{SOURCE21} \ - > $RPM_BUILD_ROOT%{_bindir}/xml-xread12 + > %{buildroot}%{_bindir}/xml-xread12 sed -e 's|__RESOLVERDIR__|%{resolverdir}|' < %{SOURCE23} \ - > $RPM_BUILD_ROOT%{_bindir}/xml-xparse12 + > %{buildroot}%{_bindir}/xml-xparse12 sed -e 's|__RESOLVERDIR__|%{resolverdir}|' < %{SOURCE18} \ - > $RPM_BUILD_ROOT%{_mandir}/man1/xml-resolver12.1 + > %{buildroot}%{_mandir}/man1/xml-resolver12.1 sed -e 's|__RESOLVERDIR__|%{resolverdir}|' < %{SOURCE20} \ - > $RPM_BUILD_ROOT%{_mandir}/man1/xml-xread12.1 + > %{buildroot}%{_mandir}/man1/xml-xread12.1 sed -e 's|__RESOLVERDIR__|%{resolverdir}|' < %{SOURCE22} \ - > $RPM_BUILD_ROOT%{_mandir}/man1/xml-xparse12.1 + > %{buildroot}%{_mandir}/man1/xml-xparse12.1 # Central CatalogManager.properties -install -d -m 755 $RPM_BUILD_ROOT%{resolverdir} -install -m 0644 %{SOURCE24} $RPM_BUILD_ROOT%{resolverdir}/CatalogManager.properties +install -d -m 755 %{buildroot}%{resolverdir} +install -m 0644 %{SOURCE24} %{buildroot}%{resolverdir}/CatalogManager.properties # docs # JAXP 1.1 -install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}-jaxp-1.1-apis-%{version} -install -m 0644 xml-commons-1_0_b2/java/external/LICENSE* $RPM_BUILD_ROOT%{_datadir}/%{name}-jaxp-1.1-apis-%{version} -install -m 0644 xml-commons-1_0_b2/java/external/README* $RPM_BUILD_ROOT%{_datadir}/%{name}-jaxp-1.1-apis-%{version} +install -d -m 755 %{buildroot}%{_datadir}/%{name}-jaxp-1.1-apis-%{version} +install -m 0644 xml-commons-1_0_b2/java/external/LICENSE* %{buildroot}%{_datadir}/%{name}-jaxp-1.1-apis-%{version} +install -m 0644 xml-commons-1_0_b2/java/external/README* %{buildroot}%{_datadir}/%{name}-jaxp-1.1-apis-%{version} # JAXP 1.2 -install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}-jaxp-1.2-apis-%{version} -install -m 0644 xml-commons-external-1_2_*/java/external/LICENSE* $RPM_BUILD_ROOT%{_datadir}/%{name}-jaxp-1.2-apis-%{version} -install -m 0644 xml-commons-external-1_2_*/java/external/README* $RPM_BUILD_ROOT%{_datadir}/%{name}-jaxp-1.2-apis-%{version} +install -d -m 755 %{buildroot}%{_datadir}/%{name}-jaxp-1.2-apis-%{version} +install -m 0644 xml-commons-external-1_2_*/java/external/LICENSE* %{buildroot}%{_datadir}/%{name}-jaxp-1.2-apis-%{version} +install -m 0644 xml-commons-external-1_2_*/java/external/README* %{buildroot}%{_datadir}/%{name}-jaxp-1.2-apis-%{version} # JAXP 1.3 -install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}-jaxp-1.3-apis-%{version} -install -m 0644 xml-commons-external-1_3_*/java/external/LICENSE* $RPM_BUILD_ROOT%{_datadir}/%{name}-jaxp-1.3-apis-%{version} -install -m 0644 xml-commons-external-1_3_*/java/external/README* $RPM_BUILD_ROOT%{_datadir}/%{name}-jaxp-1.3-apis-%{version} +install -d -m 755 %{buildroot}%{_datadir}/%{name}-jaxp-1.3-apis-%{version} +install -m 0644 xml-commons-external-1_3_*/java/external/LICENSE* %{buildroot}%{_datadir}/%{name}-jaxp-1.3-apis-%{version} +install -m 0644 xml-commons-external-1_3_*/java/external/README* %{buildroot}%{_datadir}/%{name}-jaxp-1.3-apis-%{version} # JAXP 1.4 -install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}-jaxp-1.4-apis-%{version} -install -m 0644 xml-commons-external-1_4_*/java/external/LICENSE* $RPM_BUILD_ROOT%{_datadir}/%{name}-jaxp-1.4-apis-%{version} -install -m 0644 xml-commons-external-1_4_*/java/external/README* $RPM_BUILD_ROOT%{_datadir}/%{name}-jaxp-1.4-apis-%{version} +install -d -m 755 %{buildroot}%{_datadir}/%{name}-jaxp-1.4-apis-%{version} +install -m 0644 xml-commons-external-1_4_*/java/external/LICENSE* %{buildroot}%{_datadir}/%{name}-jaxp-1.4-apis-%{version} +install -m 0644 xml-commons-external-1_4_*/java/external/README* %{buildroot}%{_datadir}/%{name}-jaxp-1.4-apis-%{version} # manuals # JAXP 1.1 -install -d -m 755 $RPM_BUILD_ROOT%{_docdir}/%{name}-jaxp-1.1-apis-%{version} -cp -pr xml-commons-1_0_b2/java/external/build/docs/* $RPM_BUILD_ROOT%{_docdir}/%{name}-jaxp-1.1-apis-%{version} +install -d -m 755 %{buildroot}%{_docdir}/%{name}-jaxp-1.1-apis-%{version} +cp -pr xml-commons-1_0_b2/java/external/build/docs/* %{buildroot}%{_docdir}/%{name}-jaxp-1.1-apis-%{version} # JAXP 1.2 -install -d -m 755 $RPM_BUILD_ROOT%{_docdir}/%{name}-jaxp-1.2-apis-%{version} -cp -pr xml-commons-external-1_2_*/java/external/build/docs/* $RPM_BUILD_ROOT%{_docdir}/%{name}-jaxp-1.2-apis-%{version} +install -d -m 755 %{buildroot}%{_docdir}/%{name}-jaxp-1.2-apis-%{version} +cp -pr xml-commons-external-1_2_*/java/external/build/docs/* %{buildroot}%{_docdir}/%{name}-jaxp-1.2-apis-%{version} # JAXP 1.3 -install -d -m 755 $RPM_BUILD_ROOT%{_docdir}/%{name}-jaxp-1.3-apis-%{version} -cp -pr xml-commons-external-1_3_*/java/external/build/docs/* $RPM_BUILD_ROOT%{_docdir}/%{name}-jaxp-1.3-apis-%{version} +install -d -m 755 %{buildroot}%{_docdir}/%{name}-jaxp-1.3-apis-%{version} +cp -pr xml-commons-external-1_3_*/java/external/build/docs/* %{buildroot}%{_docdir}/%{name}-jaxp-1.3-apis-%{version} # JAXP 1.4 -install -d -m 755 $RPM_BUILD_ROOT%{_docdir}/%{name}-jaxp-1.4-apis-%{version} -cp -pr xml-commons-external-1_4_*/java/external/build/docs/* $RPM_BUILD_ROOT%{_docdir}/%{name}-jaxp-1.4-apis-%{version} +install -d -m 755 %{buildroot}%{_docdir}/%{name}-jaxp-1.4-apis-%{version} +cp -pr xml-commons-external-1_4_*/java/external/build/docs/* %{buildroot}%{_docdir}/%{name}-jaxp-1.4-apis-%{version} # For Symlinks and alternatives mkdir -p %{buildroot}%{_sysconfdir}/alternatives @@ -560,22 +534,22 @@ ln -sf %{_sysconfdir}/alternatives/xml-xread.1.gz %{buildroot}/%{_mandir}/man1/xml-xread.1.gz ln -sf %{_sysconfdir}/alternatives/xml-xparse.1.gz %{buildroot}/%{_mandir}/man1/xml-xparse.1.gz -%{__chmod} 755 $RPM_BUILD_ROOT%{_bindir}* +chmod 755 %{buildroot}%{_bindir}* -%{__perl} -pi -e 's/\r$//g' README.html KEYS +perl -pi -e 's/\r$//g' README.html KEYS %if %{with_repolib} -install -d -m 755 $RPM_BUILD_ROOT%{repodir} -install -d -m 755 $RPM_BUILD_ROOT%{repodirlib} -install -m 755 %{SOURCE100} $RPM_BUILD_ROOT%{repodir}/component-info.xml -sed -i 's/@VERSION@/%{version}-brew/g' $RPM_BUILD_ROOT%{repodir}/component-info.xml +install -d -m 755 %{buildroot}%{repodir} +install -d -m 755 %{buildroot}%{repodirlib} +install -m 755 %{SOURCE100} %{buildroot}%{repodir}/component-info.xml +sed -i 's/@VERSION@/%{version}-brew/g' %{buildroot}%{repodir}/component-info.xml tag=`echo %{name}-%{version}-%{release} | sed 's|\.|_|g'` -sed -i "s/@TAG@/$tag/g" $RPM_BUILD_ROOT%{repodir}/component-info.xml -install -d -m 755 $RPM_BUILD_ROOT%{repodirsrc} -install -m 755 %{SOURCE0} $RPM_BUILD_ROOT%{repodirsrc} -cp -p $RPM_BUILD_ROOT%{_javadir}/%{name}-jaxp-1.3-apis-%{version}.jar $RPM_BUILD_ROOT%{repodirlib}/xml-apis.jar -cp -p $RPM_BUILD_ROOT%{_javadir}/%{name}-resolver11-%{version}.jar $RPM_BUILD_ROOT%{repodirlib}/resolver.jar -install -m 755 %{SOURCE3} $RPM_BUILD_ROOT%{repodirsrc} +sed -i "s/@TAG@/$tag/g" %{buildroot}%{repodir}/component-info.xml +install -d -m 755 %{buildroot}%{repodirsrc} +install -m 755 %{SOURCE0} %{buildroot}%{repodirsrc} +cp -p %{buildroot}%{_javadir}/%{name}-jaxp-1.3-apis-%{version}.jar %{buildroot}%{repodirlib}/xml-apis.jar +cp -p %{buildroot}%{_javadir}/%{name}-resolver11-%{version}.jar %{buildroot}%{repodirlib}/resolver.jar +install -m 755 %{SOURCE3} %{buildroot}%{repodirsrc} %endif %if 0%{?suse_version} @@ -584,7 +558,6 @@ %endif %post jaxp-1.1-apis -#rm -f %{_javadir}/xml-commons-apis.jar rm -f %{_javadir}/jaxp11.jar ln -s %{name}-jaxp-1.1-apis.jar %{_javadir}/jaxp11.jar %{_sbindir}/update-alternatives --install %{_javadir}/xml-commons-apis.jar xml-commons-apis %{_javadir}/jaxp11.jar 10100 @@ -621,9 +594,9 @@ %{_sbindir}/update-alternatives --install %{_bindir}/xml-resolver xml-resolver %{_bindir}/xml-resolver10 10000 \ --slave %{_bindir}/xml-xread xml-xread %{_bindir}/xml-xread10 \ --slave %{_bindir}/xml-xparse xml-xparse %{_bindir}/xml-xparse10 \ ---slave %{_mandir}/man1/xml-resolver.1%ext_man xml-resolver.1%ext_man %{_mandir}/man1/xml-resolver10.1%ext_man \ ---slave %{_mandir}/man1/xml-xread.1%ext_man xml-xread.1%ext_man %{_mandir}/man1/xml-xread10.1%ext_man \ ---slave %{_mandir}/man1/xml-xparse.1%ext_man xml-xparse.1%ext_man %{_mandir}/man1/xml-xparse10.1%ext_man +--slave %{_mandir}/man1/xml-resolver.1%{ext_man} xml-resolver.1%{ext_man} %{_mandir}/man1/xml-resolver10.1%{ext_man} \ +--slave %{_mandir}/man1/xml-xread.1%{ext_man} xml-xread.1%{ext_man} %{_mandir}/man1/xml-xread10.1%{ext_man} \ +--slave %{_mandir}/man1/xml-xparse.1%{ext_man} xml-xparse.1%{ext_man} %{_mandir}/man1/xml-xparse10.1%{ext_man} %{_sbindir}/update-alternatives --install %{_javadir}/xml-commons-resolver.jar xml-commons-resolver %{_javadir}/xml-commons-resolver10.jar 10000 %postun resolver10 @@ -636,9 +609,9 @@ %{_sbindir}/update-alternatives --install %{_bindir}/xml-resolver xml-resolver %{_bindir}/xml-resolver11 10100 \ --slave %{_bindir}/xml-xread xml-xread %{_bindir}/xml-xread11 \ --slave %{_bindir}/xml-xparse xml-xparse %{_bindir}/xml-xparse11 \ ---slave %{_mandir}/man1/xml-resolver.1%ext_man xml-resolver.1%ext_man %{_mandir}/man1/xml-resolver11.1%ext_man \ ---slave %{_mandir}/man1/xml-xread.1%ext_man xml-xread.1%ext_man %{_mandir}/man1/xml-xread11.1%ext_man \ ---slave %{_mandir}/man1/xml-xparse.1%ext_man xml-xparse.1%ext_man %{_mandir}/man1/xml-xparse11.1%ext_man +--slave %{_mandir}/man1/xml-resolver.1%{ext_man} xml-resolver.1%{ext_man} %{_mandir}/man1/xml-resolver11.1%{ext_man} \ +--slave %{_mandir}/man1/xml-xread.1%{ext_man} xml-xread.1%{ext_man} %{_mandir}/man1/xml-xread11.1%{ext_man} \ +--slave %{_mandir}/man1/xml-xparse.1%{ext_man} xml-xparse.1%{ext_man} %{_mandir}/man1/xml-xparse11.1%{ext_man} %{_sbindir}/update-alternatives --install %{_javadir}/xml-commons-resolver.jar xml-commons-resolver %{_javadir}/xml-commons-resolver11.jar 10100 %postun resolver11 @@ -707,9 +680,9 @@ %{_sbindir}/update-alternatives --install %{_bindir}/xml-resolver xml-resolver %{_bindir}/xml-resolver12 10200 \ --slave %{_bindir}/xml-xread xml-xread %{_bindir}/xml-xread12 \ --slave %{_bindir}/xml-xparse xml-xparse %{_bindir}/xml-xparse12 \ ---slave %{_mandir}/man1/xml-resolver.1%ext_man xml-resolver.1%ext_man %{_mandir}/man1/xml-resolver12.1%ext_man \ ---slave %{_mandir}/man1/xml-xread.1%ext_man xml-xread.1%ext_man %{_mandir}/man1/xml-xread12.1%ext_man \ ---slave %{_mandir}/man1/xml-xparse.1%ext_man xml-xparse.1%ext_man %{_mandir}/man1/xml-xparse12.1%ext_man +--slave %{_mandir}/man1/xml-resolver.1%{ext_man} xml-resolver.1%{ext_man} %{_mandir}/man1/xml-resolver12.1%{ext_man} \ +--slave %{_mandir}/man1/xml-xread.1%{ext_man} xml-xread.1%{ext_man} %{_mandir}/man1/xml-xread12.1%{ext_man} \ +--slave %{_mandir}/man1/xml-xparse.1%{ext_man} xml-xparse.1%{ext_man} %{_mandir}/man1/xml-xparse12.1%{ext_man} %{_sbindir}/update-alternatives --install %{_javadir}/xml-commons-resolver.jar xml-commons-resolver %{_javadir}/xml-commons-resolver12.jar 10200 %postun resolver12 @@ -759,7 +732,7 @@ %{_javadir}/%{name}-jaxp-1.1-apis*.jar %{_javadir}/xml-commons-apis.jar %ghost %{_sysconfdir}/alternatives/xml-commons-apis.jar - %{_javadir}/jaxp11.jar +%{_javadir}/jaxp11.jar %ghost %{_sysconfdir}/alternatives/jaxp11.jar %{_javadir}/jaxp.jar %ghost %{_sysconfdir}/alternatives/jaxp.jar @@ -804,9 +777,9 @@ %ghost %{_sysconfdir}/alternatives/xml-resolver %ghost %{_sysconfdir}/alternatives/xml-xread %ghost %{_sysconfdir}/alternatives/xml-xparse -%{_mandir}/man1/xml-resolver.1.gz -%{_mandir}/man1/xml-xread.1.gz -%{_mandir}/man1/xml-xparse.1.gz +%{_mandir}/man1/xml-resolver.1%{ext_man} +%{_mandir}/man1/xml-xread.1%{ext_man} +%{_mandir}/man1/xml-xparse.1%{ext_man} %ghost %{_sysconfdir}/alternatives/xml-resolver.1.gz %ghost %{_sysconfdir}/alternatives/xml-xread.1.gz %ghost %{_sysconfdir}/alternatives/xml-xparse.1.gz @@ -828,9 +801,9 @@ %ghost %{_sysconfdir}/alternatives/xml-resolver %ghost %{_sysconfdir}/alternatives/xml-xread %ghost %{_sysconfdir}/alternatives/xml-xparse -%{_mandir}/man1/xml-resolver.1.gz -%{_mandir}/man1/xml-xread.1.gz -%{_mandir}/man1/xml-xparse.1.gz +%{_mandir}/man1/xml-resolver.1%{ext_man} +%{_mandir}/man1/xml-xread.1%{ext_man} +%{_mandir}/man1/xml-xparse.1%{ext_man} %ghost %{_sysconfdir}/alternatives/xml-resolver.1.gz %ghost %{_sysconfdir}/alternatives/xml-xread.1.gz %ghost %{_sysconfdir}/alternatives/xml-xparse.1.gz @@ -918,9 +891,9 @@ %ghost %{_sysconfdir}/alternatives/xml-resolver %ghost %{_sysconfdir}/alternatives/xml-xread %ghost %{_sysconfdir}/alternatives/xml-xparse -%{_mandir}/man1/xml-resolver.1.gz -%{_mandir}/man1/xml-xread.1.gz -%{_mandir}/man1/xml-xparse.1.gz +%{_mandir}/man1/xml-resolver.1%{ext_man} +%{_mandir}/man1/xml-xread.1%{ext_man} +%{_mandir}/man1/xml-xparse.1%{ext_man} %ghost %{_sysconfdir}/alternatives/xml-resolver.1.gz %ghost %{_sysconfdir}/alternatives/xml-xread.1.gz %ghost %{_sysconfdir}/alternatives/xml-xparse.1.gz @@ -955,7 +928,6 @@ %{_docdir}/%{name}-jaxp-1.4-apis-%{version} %if %{with_repolib} - %files repolib %defattr(0644,root,root,0755) %{repodir}

1 0

commit xpp3 for openSUSE:Factory
by root＠hilbert.suse.de 31 May '17

31 May '17

Hello community, here is the log from the commit of package xpp3 for openSUSE:Factory checked in at 2017-05-31 13:30:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xpp3 (Old) and /work/SRC/openSUSE:Factory/.xpp3.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xpp3" Wed May 31 13:30:20 2017 rev:17 rq:496813 version:1.1.4c Changes: -------- --- /work/SRC/openSUSE:Factory/xpp3/xpp3.changes 2014-12-06 13:45:21.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.xpp3.new/xpp3.changes 2017-05-31 13:30:21.459155672 +0200 @@ -1,0 +2,5 @@ +Fri May 19 16:26:28 UTC 2017 - tchvatal(a)suse.com + +- Do not require javapackage-tools + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xpp3.spec ++++++ --- /var/tmp/diff_new_pack.6uZ8v1/_old 2017-05-31 13:30:22.998938634 +0200 +++ /var/tmp/diff_new_pack.6uZ8v1/_new 2017-05-31 13:30:23.002938070 +0200 @@ -1,7 +1,7 @@ # # spec file for package xpp3 # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,25 +16,22 @@ # -%define section free -Summary: XML Pull Parser -License: Apache-1.1 -Group: Development/Libraries/Java - Name: xpp3 Version: 1.1.4c Release: 0 +Summary: XML Pull Parser +License: Apache-1.1 +Group: Development/Libraries/Java Url: http://www.extreme.indiana.edu/xgws/xsoap/xpp/mxp1/index.html Source0: http://www.extreme.indiana.edu/dist/java-repository/xpp3/distributions/xpp3… -Requires: java >= 1.4.2 -Requires: javapackages-tools BuildRequires: ant >= 1.6 BuildRequires: javapackages-tools BuildRequires: junit BuildRequires: perl BuildRequires: xml-commons-apis -BuildArch: noarch +Requires: java >= 1.4.2 BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildArch: noarch %description Xml Pull Parser 3rd Edition (XPP3) MXP1 is a new XmlPull parsing engine @@ -75,17 +72,17 @@ %install # jars -mkdir -p $RPM_BUILD_ROOT%{_javadir} +mkdir -p %{buildroot}%{_javadir} cp -p build/%{name}-%{version}.jar \ - $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar + %{buildroot}%{_javadir}/%{name}-%{version}.jar cp -p build/%{name}_min-%{version}.jar \ - $RPM_BUILD_ROOT%{_javadir}/%{name}-minimal-%{version}.jar + %{buildroot}%{_javadir}/%{name}-minimal-%{version}.jar cp -p build/%{name}_xpath-%{version}.jar \ - $RPM_BUILD_ROOT%{_javadir}/%{name}-xpath-%{version}.jar -(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done) + %{buildroot}%{_javadir}/%{name}-xpath-%{version}.jar +(cd %{buildroot}%{_javadir} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done) # javadoc -mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name} -cp -pr doc/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} +mkdir -p %{buildroot}%{_javadocdir}/%{name} +cp -pr doc/api/* %{buildroot}%{_javadocdir}/%{name} rm -rf doc/{build.txt,api} %files

1 0

commit fastjar for openSUSE:Factory
by root＠hilbert.suse.de 31 May '17

31 May '17

Hello community, here is the log from the commit of package fastjar for openSUSE:Factory checked in at 2017-05-31 13:30:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/fastjar (Old) and /work/SRC/openSUSE:Factory/.fastjar.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "fastjar" Wed May 31 13:30:15 2017 rev:20 rq:496810 version:0.98 Changes: -------- --- /work/SRC/openSUSE:Factory/fastjar/fastjar.changes 2015-04-21 10:45:48.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.fastjar.new/fastjar.changes 2017-05-31 13:30:16.315880634 +0200 @@ -1,0 +2,11 @@ +Fri May 19 14:14:56 UTC 2017 - tchvatal(a)suse.com + +- Apply patches from debian to be up-par: + * fix-update-mode.diff + * jartool.diff +- Remove patch fastjar-0.98-fix.patch + * Merged in jartool.diff +- Remove patch fastjar-0.98-directory-traversal.patch + * Merged in jartool.diff + +------------------------------------------------------------------- Old: ---- fastjar-0.98-directory-traversal.patch fastjar-0.98-fix.patch New: ---- fix-update-mode.diff jartool.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fastjar.spec ++++++ --- /var/tmp/diff_new_pack.UGfDW8/_old 2017-05-31 13:30:16.991785363 +0200 +++ /var/tmp/diff_new_pack.UGfDW8/_new 2017-05-31 13:30:16.995784799 +0200 @@ -1,7 +1,7 @@ # # spec file for package fastjar # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,7 +19,7 @@ Name: fastjar Version: 0.98 Release: 0 -Summary: The fastjar Java package archiver +Summary: Java package archiver License: GPL-2.0+ Group: Development/Languages/Java Url: http://savannah.nongnu.org/projects/fastjar/ @@ -27,12 +27,11 @@ # Current signing key has expired #Source1: http://download.savannah.gnu.org/releases/%{name}/%{name}-%{version}.tar.gz… #Source2: http://savannah.nongnu.org/project/memberlist-gpgkeys.php?group=%{name}&dow… -Patch0: fastjar-0.98-fix.patch -Patch1: fastjar-0.98-directory-traversal.patch +Patch2: fix-update-mode.diff +Patch3: jartool.diff BuildRequires: zlib-devel -Requires(preun): %{install_info_prereq} Requires(post): %{install_info_prereq} -Provides: libgcj:%{_bindir}/fastjar +Requires(preun): %{install_info_prereq} BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -42,28 +41,27 @@ %prep %setup -q -%patch0 -%patch1 -p1 -b .directory-traversal +%autopatch -p1 %build %configure make %{?_smp_mflags} %install -make DESTDIR=%{buildroot} install %{?_smp_mflags} +%make_install %post -%install_info --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz +%install_info --info-dir=%{_infodir} %{_infodir}/%{name}.info%{ext_info} %preun -%install_info_delete --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz +%install_info_delete --info-dir=%{_infodir} %{_infodir}/%{name}.info%{ext_info} %files %defattr(-,root,root) %doc AUTHORS README NEWS ChangeLog -%{_mandir}/man1/fastjar.1.gz -%{_mandir}/man1/grepjar.1.gz -%{_infodir}/fastjar.info.gz +%{_mandir}/man1/fastjar.1%{ext_man} +%{_mandir}/man1/grepjar.1%{ext_man} +%{_infodir}/fastjar.info%{ext_info} %{_bindir}/fastjar %{_bindir}/grepjar ++++++ fix-update-mode.diff ++++++ Index: b/compress.c =================================================================== --- a/compress.c +++ b/compress.c @@ -86,6 +86,10 @@ write_data (int fd, void *buf, size_t le exit(EXIT_FAILURE); } } + else if (!next && here + len >= end_of_entries) + { + end_of_entries = here + len; + } } return write (fd, buf, len); Index: b/jartool.c =================================================================== --- a/jartool.c +++ b/jartool.c @@ -1273,15 +1273,18 @@ int add_file_to_jar(int jfd, int ffd, co compress_file(ffd, jfd, ze, existing); } else { /* If we are not writing the last entry, make space for it. */ - if (existing && existing->next_entry) + if (existing) { - if (ze->usize > existing->usize) + if (existing->next_entry) { - if (shift_down (jfd, existing->next_entry->offset, - ze->usize - existing->usize, existing->next_entry)) + if (ze->usize > existing->usize) { - fprintf (stderr, "%s: %s\n", progname, strerror (errno)); - return 1; + if (shift_down (jfd, existing->next_entry->offset, + ze->usize - existing->usize, existing->next_entry)) + { + fprintf (stderr, "%s: %s\n", progname, strerror (errno)); + return 1; + } } } } ++++++ jartool.diff ++++++ --- fastjar-0.98.orig/jartool.c +++ fastjar-0.98/jartool.c @@ -790,6 +790,7 @@ int read_entries (int fd) progname, jarfile); return 1; } + ze->filename[len] = '\0'; len = UNPACK_UB4(header, CEN_EFLEN); len += UNPACK_UB4(header, CEN_COMLEN); if (lseek (fd, len, SEEK_CUR) == -1) @@ -1257,7 +1258,7 @@ int add_file_to_jar(int jfd, int ffd, co exit_on_error("write"); /* write the file name to the zip file */ - if (1 == write(jfd, fname, file_name_length)) + if (-1 == write(jfd, fname, file_name_length)) exit_on_error("write"); if(verbose){ @@ -1730,7 +1731,17 @@ int extract_jar(int fd, const char **fil struct stat sbuf; int depth = 0; - tmp_buff = malloc(sizeof(char) * strlen((const char *)filename)); + if(*filename == '/'){ + fprintf(stderr, "Absolute path names are not allowed.\n"); + exit(EXIT_FAILURE); + } + + tmp_buff = malloc(strlen((const char *)filename)); + + if(tmp_buff == NULL) { + fprintf(stderr, "Out of memory.\n"); + exit(EXIT_FAILURE); + } for(;;){ const ub1 *idx = (const unsigned char *)strchr((const char *)start, '/'); @@ -1738,25 +1749,28 @@ int extract_jar(int fd, const char **fil if(idx == NULL) break; else if(idx == start){ + tmp_buff[idx - filename] = '/'; start++; continue; } - start = idx + 1; - strncpy(tmp_buff, (const char *)filename, (idx - filename)); - tmp_buff[(idx - filename)] = '\0'; + memcpy(tmp_buff + (start - filename), (const char *)start, (idx - start)); + tmp_buff[idx - filename] = '\0'; #ifdef DEBUG printf("checking the existance of %s\n", tmp_buff); #endif - if(strcmp(tmp_buff, "..") == 0){ + if(idx - start == 2 && memcmp(start, "..", 2) == 0){ --depth; if (depth < 0){ fprintf(stderr, "Traversal to parent directories during unpacking!\n"); exit(EXIT_FAILURE); } - } else if (strcmp(tmp_buff, ".") != 0) + } else if (idx - start != 1 || *start != '.') ++depth; + + start = idx + 1; + if(stat(tmp_buff, &sbuf) < 0){ if(errno != ENOENT) exit_on_error("stat"); @@ -1765,6 +1779,7 @@ int extract_jar(int fd, const char **fil #ifdef DEBUG printf("Directory exists\n"); #endif + tmp_buff[idx - filename] = '/'; continue; }else { fprintf(stderr, "Hmmm.. %s exists but isn't a directory!\n", @@ -1781,10 +1796,11 @@ int extract_jar(int fd, const char **fil if(verbose && handle) printf("%10s: %s/\n", "created", tmp_buff); + tmp_buff[idx - filename] = '/'; } /* only a directory */ - if(strlen((const char *)start) == 0) + if(*start == '\0') dir = TRUE; #ifdef DEBUG @@ -1792,7 +1808,7 @@ int extract_jar(int fd, const char **fil #endif /* If the entry was just a directory, don't write to file, etc */ - if(strlen((const char *)start) == 0) + if(*start == '\0') f_fd = -1; free(tmp_buff); @@ -1876,7 +1892,8 @@ int extract_jar(int fd, const char **fil exit(EXIT_FAILURE); } - close(f_fd); + if (f_fd != -1) + close(f_fd); if(verbose && dir == FALSE && handle) printf("%10s: %s\n",

1 0

commit jakarta-commons-net for openSUSE:Factory
by root＠hilbert.suse.de 31 May '17

31 May '17

Hello community, here is the log from the commit of package jakarta-commons-net for openSUSE:Factory checked in at 2017-05-31 13:30:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/jakarta-commons-net (Old) and /work/SRC/openSUSE:Factory/.jakarta-commons-net.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "jakarta-commons-net" Wed May 31 13:30:09 2017 rev:21 rq:496778 version:1.4.1 Changes: -------- --- /work/SRC/openSUSE:Factory/jakarta-commons-net/jakarta-commons-net.changes 2015-04-02 15:56:25.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.jakarta-commons-net.new/jakarta-commons-net.changes 2017-05-31 13:30:12.360438167 +0200 @@ -1,0 +2,5 @@ +Fri May 19 13:56:33 UTC 2017 - tchvatal(a)suse.com + +- Fix build with new javapackages-tools + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ jakarta-commons-net.spec ++++++ --- /var/tmp/diff_new_pack.d41Iba/_old 2017-05-31 13:30:14.344158556 +0200 +++ /var/tmp/diff_new_pack.d41Iba/_new 2017-05-31 13:30:14.348157991 +0200 @@ -1,7 +1,7 @@ # # spec file for package jakarta-commons-net # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,10 +16,6 @@ # -%define _without_maven 1 -%define with_maven %{!?_without_maven:1}%{?_without_maven:0} -%define without_maven %{?_without_maven:1}%{!?_without_maven:0} -%define without_tests 1 %define base_name net %define short_name commons-%{base_name} Name: jakarta-commons-net @@ -44,32 +40,13 @@ Patch3: commons-net-ftp-leap-year-parsing.patch BuildRequires: ant >= 1.6 BuildRequires: java-devel +BuildRequires: javapackages-local BuildRequires: javapackages-tools BuildRequires: oro Requires: oro >= 2.0.8 Provides: %{short_name} = %{version}-%{release} Obsoletes: %{short_name} < %{version}-%{release} -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch -%if ! %{without_tests} -BuildRequires: ant-junit >= 1.6 -BuildRequires: junit >= 3.8.1 -%endif -%if %{with_maven} -BuildRequires: maven >= 1.1 -BuildRequires: maven-plugin-changes -BuildRequires: maven-plugin-checkstyle -BuildRequires: maven-plugin-jcoverage -BuildRequires: maven-plugin-jdepend -BuildRequires: maven-plugin-jxr -BuildRequires: maven-plugin-license -BuildRequires: maven-plugin-tasklist -BuildRequires: maven-plugin-test -BuildRequires: maven-plugin-xdoc -BuildRequires: maven-plugins-base -BuildRequires: saxon9 -BuildRequires: saxon9-scripts -%endif %description This is an Internet protocol suite Java library originally developed by @@ -89,21 +66,6 @@ well as BSD R command support. The purpose of the library is to provide fundamental protocol access, not higher-level abstractions. -%if %{with_maven} - -%package manual -Summary: Jakarta Commons Net Package -Group: Development/Libraries/Java - -%description manual -This is an Internet protocol suite Java library originally developed by -ORO, Inc. This version supports Finger, Whois, TFTP, Telnet, POP3, -FTP, NNTP, SMTP, and some miscellaneous protocols like Time and Echo as -well as BSD R command support. The purpose of the library is to provide -fundamental protocol access, not higher-level abstractions. - -%endif - %prep %setup -q -n %{short_name}-%{version} gzip -dc %{SOURCE5} | tar xf - @@ -115,47 +77,13 @@ find . -name "*.jar" -exec rm -f {} \; %build -%if %{with_maven} -export DEPCAT=$(pwd)/commons-net-1.4.1-depcat.new.xml -echo '<?xml version="1.0" standalone="yes"?>' > $DEPCAT -echo '<depset>' >> $DEPCAT -for p in $(find . -name project.xml); do - pushd $(dirname $p) - %{_bindir}/saxon9 project.xml %{SOURCE1} >> $DEPCAT - popd -done -echo >> $DEPCAT -echo '</depset>' >> $DEPCAT -%{_bindir}/saxon9 $DEPCAT %{SOURCE2} > commons-net-1.4.1-depmap.new.xml -for p in $(find . -name project.xml); do - pushd $(dirname $p) - cp project.xml project.xml.orig - %{_bindir}/saxon9 -o project.xml project.xml.orig %{SOURCE3} map=%{SOURCE4} - popd -done -export MAVEN_HOME_LOCAL=$(pwd)/.maven -# -Dmaven.test.failure.ignore=true \ -maven -e \ - -Dmaven.repo.remote=file:%{_datadir}/maven/repository \ - -Dmaven.home.local=${MAVEN_HOME_LOCAL} \ - jar:jar javadoc:generate site -%else mkdir -p target/lib ln -s %{_javadir}/oro.jar target/lib ln -s %{_javadir}/junit.jar target/lib -%if %{without_tests} ant \ -Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5 \ -Dnoget=true -Dfinal.name=commons-net-%{version} -Dj2se.api=%{_javadocdir}/java \ jar javadoc -%else -export OPT_JAR_LIST="ant/ant-junit junit" -ant \ - -Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5 \ - -Dnoget=true -Dfinal.name=commons-net-%{version} -Dj2se.api=%{_javadocdir}/java jar \ - test javadoc -%endif -%endif %install # jars @@ -171,18 +99,7 @@ # javadoc install -d -m 755 %{buildroot}%{_javadocdir}/%{name} -%if %{with_maven} -cp -pr target/docs/apidocs/* %{buildroot}%{_javadocdir}/%{name}-%{version} -%else cp -pr dist/docs/api/* %{buildroot}%{_javadocdir}/%{name} -%endif -#rm -rf target/docs/apidocs -# manual -%if %{with_maven} -install -d -m 755 %{buildroot}%{_docdir}/%{name}-%{version} -install -d -m 755 %{buildroot}%{_docdir}/%{name}-%{version}/site -cp -pr target/docs/* %{buildroot}%{_docdir}/%{name}-%{version}/site -%endif %files %defattr(0644,root,root,0755) @@ -195,11 +112,4 @@ %defattr(0644,root,root,0755) %{_javadocdir}/%{name} -%if %{with_maven} - -%files manual -%defattr(0644,root,root,0755) -%doc %{_docdir}/%{name}-%{version}/site -%endif - %changelog

1 0

commit antlr for openSUSE:Factory
by root＠hilbert.suse.de 31 May '17

31 May '17

Hello community, here is the log from the commit of package antlr for openSUSE:Factory checked in at 2017-05-31 13:30:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/antlr (Old) and /work/SRC/openSUSE:Factory/.antlr.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "antlr" Wed May 31 13:30:03 2017 rev:33 rq:496776 version:2.7.7 Changes: -------- --- /work/SRC/openSUSE:Factory/antlr/antlr.changes 2014-12-06 13:45:19.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.antlr.new/antlr.changes 2017-05-31 13:30:05.605390313 +0200 @@ -1,0 +2,5 @@ +Fri May 19 13:28:56 UTC 2017 - tchvatal(a)suse.com + +- Reduce dependencies a bit + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ antlr-bootstrap.spec ++++++ --- /var/tmp/diff_new_pack.NlbUeq/_old 2017-05-31 13:30:07.429133251 +0200 +++ /var/tmp/diff_new_pack.NlbUeq/_new 2017-05-31 13:30:07.437132123 +0200 @@ -1,7 +1,7 @@ # # spec file for package antlr-bootstrap # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed ++++++ antlr.spec ++++++ --- /var/tmp/diff_new_pack.NlbUeq/_old 2017-05-31 13:30:07.481125922 +0200 +++ /var/tmp/diff_new_pack.NlbUeq/_new 2017-05-31 13:30:07.485125359 +0200 @@ -1,7 +1,7 @@ # # spec file for package antlr # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -35,12 +35,10 @@ BuildRequires: ant BuildRequires: fdupes BuildRequires: gcc-c++ -BuildRequires: libstdc++-devel -BuildRequires: python-devel -BuildRequires: unzip +BuildRequires: javapackages-tools +BuildRequires: python BuildRequires: xml-commons-apis Requires: %{name}-java -Requires: javapackages-tools Provides: %{name}-bootstrap = %{version} Obsoletes: %{name}-bootstrap < %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -51,16 +49,11 @@ compilers, and translators from grammatical descriptions containing C++ or Java actions (you can use PCCTS 1.xx to generate C-based parsers). -# To not introduce arch dependent java package, lets have this in separate subpackage - %package java Summary: ANother Tool for Language Recognition (Manual) Group: Development/Tools/Other Requires: java >= 1.6.0 -Provides: file:/%{_javadir}/%{name}.jar -%if 0%{?suse_version} > 1200 BuildArch: noarch -%endif %description java ANTLR, Another Tool for Language Recognition, (formerly PCCTS) is a @@ -73,9 +66,7 @@ %package manual Summary: ANother Tool for Language Recognition (Manual) Group: Development/Tools/Other -%if 0%{?suse_version} > 1200 BuildArch: noarch -%endif %description manual ANTLR, Another Tool for Language Recognition, (formerly PCCTS) is a @@ -88,9 +79,7 @@ %package javadoc Summary: ANother Tool for Language Recognition (Java Documentation) Group: Development/Tools/Other -%if 0%{?suse_version} > 1200 BuildArch: noarch -%endif %description javadoc ANTLR, Another Tool for Language Recognition, (formerly PCCTS) is a

1 0

commit wsdl4j for openSUSE:Factory
by root＠hilbert.suse.de 31 May '17

31 May '17

Hello community, here is the log from the commit of package wsdl4j for openSUSE:Factory checked in at 2017-05-31 13:29:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/wsdl4j (Old) and /work/SRC/openSUSE:Factory/.wsdl4j.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "wsdl4j" Wed May 31 13:29:58 2017 rev:21 rq:496741 version:1.6.3 Changes: -------- --- /work/SRC/openSUSE:Factory/wsdl4j/wsdl4j.changes 2015-04-02 15:59:28.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.wsdl4j.new/wsdl4j.changes 2017-05-31 13:30:00.222149099 +0200 @@ -1,0 +2,5 @@ +Fri May 19 12:12:11 UTC 2017 - tchvatal(a)suse.com + +- Fix building of axis with this new javapackages-tools + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wsdl4j.spec ++++++ --- /var/tmp/diff_new_pack.ueywHk/_old 2017-05-31 13:30:00.754074121 +0200 +++ /var/tmp/diff_new_pack.ueywHk/_new 2017-05-31 13:30:00.758073558 +0200 @@ -1,7 +1,7 @@ # # spec file for package wsdl4j # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -27,14 +27,13 @@ Source1: %{name}-MANIFEST.MF Source2: http://repo1.maven.org/maven2/wsdl4j/wsdl4j/%{version}/wsdl4j-%{version}.pom BuildRequires: ant-junit +BuildRequires: javapackages-local BuildRequires: javapackages-tools BuildRequires: unzip BuildRequires: xml-commons-apis BuildRequires: zip Requires: java Requires: jaxp_parser_impl -Requires(post): javapackages-tools -Requires(postun): javapackages-tools BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch

1 0

commit saxon9 for openSUSE:Factory
by root＠hilbert.suse.de 31 May '17

31 May '17

Hello community, here is the log from the commit of package saxon9 for openSUSE:Factory checked in at 2017-05-31 13:29:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/saxon9 (Old) and /work/SRC/openSUSE:Factory/.saxon9.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "saxon9" Wed May 31 13:29:52 2017 rev:14 rq:496738 version:9.4.0.7 Changes: -------- --- /work/SRC/openSUSE:Factory/saxon9/saxon9.changes 2015-04-02 15:58:42.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.saxon9.new/saxon9.changes 2017-05-31 13:29:53.891041487 +0200 @@ -1,0 +2,5 @@ +Fri May 19 11:02:53 UTC 2017 - dziolkowski(a)suse.com + +- New build dependency: javapackages-local + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ saxon9.spec ++++++ --- /var/tmp/diff_new_pack.f5UcVO/_old 2017-05-31 13:29:55.114868984 +0200 +++ /var/tmp/diff_new_pack.f5UcVO/_new 2017-05-31 13:29:55.114868984 +0200 @@ -1,7 +1,7 @@ # # spec file for package saxon9 # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -38,6 +38,8 @@ BuildRequires: bea-stax-api BuildRequires: dom4j BuildRequires: java-devel +BuildRequires: javapackages-local +BuildRequires: javapackages-tools BuildRequires: jdom BuildRequires: unzip BuildRequires: xml-commons-apis @@ -95,7 +97,6 @@ Summary: Utility scripts for %{name} Group: Productivity/Publishing/XML Requires: %{name} = %{version}-%{release} -Requires: javapackages-tools Requires: jaxp_parser_impl Requires: xml-commons-apis

1 0

commit objectweb-asm for openSUSE:Factory
by root＠hilbert.suse.de 31 May '17

31 May '17

Hello community, here is the log from the commit of package objectweb-asm for openSUSE:Factory checked in at 2017-05-31 13:29:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/objectweb-asm (Old) and /work/SRC/openSUSE:Factory/.objectweb-asm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "objectweb-asm" Wed May 31 13:29:47 2017 rev:17 rq:496735 version:3.3.1 Changes: -------- --- /work/SRC/openSUSE:Factory/objectweb-asm/objectweb-asm.changes 2015-04-02 15:58:19.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.objectweb-asm.new/objectweb-asm.changes 2017-05-31 13:29:48.807757990 +0200 @@ -1,0 +2,8 @@ +Fri May 19 12:01:04 UTC 2017 - dziolkowski(a)suse.com + +- New build dependency: javapackages-local +- cleaned spec using spec-cleaner +- remove "section free" macro +- get rid of %if 0 blocks + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ objectweb-asm.spec ++++++ --- /var/tmp/diff_new_pack.TMd3kE/_old 2017-05-31 13:29:49.495661028 +0200 +++ /var/tmp/diff_new_pack.TMd3kE/_new 2017-05-31 13:29:49.499660464 +0200 @@ -1,7 +1,7 @@ # # spec file for package objectweb-asm # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,8 +16,6 @@ # -%define section free - Name: objectweb-asm Version: 3.3.1 Release: 0 @@ -36,17 +34,17 @@ Source8: http://repo1.maven.org/maven2/asm/asm-parent/3.3.1/asm-parent-3.3.1.pom Source9: asm-MANIFEST.MF Patch0: objectweb-asm-no-classpath-in-manifest.patch -# Needed by asm-xml.jar -Requires: xml-commons-apis -PreReq: javapackages-tools BuildRequires: ant >= 1.6.5 BuildRequires: java-1_5_0-gcj-compat-devel +BuildRequires: javapackages-local BuildRequires: javapackages-tools BuildRequires: objectweb-anttask BuildRequires: xml-commons-apis BuildRequires: zip -BuildArch: noarch +# Needed by asm-xml.jar +Requires: xml-commons-apis BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildArch: noarch %description ASM is a Java bytecode manipulation framework. @@ -59,23 +57,6 @@ ASM offers similar functionalities as BCEL or SERP, but is much smaller. -%if 0 -%package javadoc -Summary: Javadoc for %{name} -Group: Development/Libraries/Java - -%description javadoc -ASM is a Java bytecode manipulation framework. - -It can be used to dynamically generate stub classes or other proxy -classes, directly in binary form, or to dynamically modify classes at -load time, i.e., just before they are loaded into the Java Virtual -Machine. - -ASM offers similar functionalities as BCEL or SERP, but is much -smaller. -%endif - %prep %setup -q -n asm-%{version} %patch0 -p1 @@ -125,12 +106,6 @@ install -m 644 %{SOURCE8} %{buildroot}%{_mavenpomdir}/JPP.objectweb-asm-asm-parent.pom %add_maven_depmap JPP.objectweb-asm-asm-all.pom %{name}/asm-all.jar -%if 0 -# javadoc -install -p -d -m 755 %{buildroot}%{_javadocdir}/%{name} -cp -pr output/dist/doc/javadoc/user/* %{buildroot}%{_javadocdir}/%{name} -%endif - %files %defattr(0644,root,root,0755) %doc LICENSE.txt README.txt @@ -139,10 +114,4 @@ %{_mavenpomdir}/* %{_datadir}/maven-metadata/%{name}.xml* -%if 0 -%files javadoc -%defattr(0644,root,root,0755) -%{_javadocdir}/%{name} -%endif - %changelog

1 0