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 - [email protected]
+
+- 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 - [email protected]
+
+- 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}
