Bladeren bron

2015-01-24 Ryoichi INAGAKI <ryo1@toki.waseda.jp>

	* javapackages-tools: fixed spec
	* regexp, xml-commons-resolver: NEW
	* xalan-c, xerces-j2: updated
	


git-svn-id: http://trac.vinelinux.org/repos/projects/specs@9289 ec354946-7b23-47d6-9f5a-488ba84defc7
inagaki 9 jaren geleden
bovenliggende
commit
0fe63dcc02

+ 19 - 4
j/javapackages-tools/javapackages-tools-vl.spec

@@ -1,12 +1,12 @@
 Name:           javapackages-tools
 Name:           javapackages-tools
 Version:        3.4.1
 Version:        3.4.1
-Release:        6%{?_dist_release}
+Release:        7%{?_dist_release}
 
 
 Summary:        Macros and scripts for Java packaging support
 Summary:        Macros and scripts for Java packaging support
 Summary(ja):    Java パッケージをサポートするためのマクロ・スクリプト集
 Summary(ja):    Java パッケージをサポートするためのマクロ・スクリプト集
 
 
 License:        BSD
 License:        BSD
-Group:          System Environment/Base
+Group:          Development/Tools
 URL:            https://fedorahosted.org/javapackages/
 URL:            https://fedorahosted.org/javapackages/
 Source0:        https://fedorahosted.org/released/javapackages/javapackages-%{version}.tar.xz
 Source0:        https://fedorahosted.org/released/javapackages/javapackages-%{version}.tar.xz
 
 
@@ -37,6 +37,7 @@ This package provides macros and scripts to support Java packaging.
 
 
 #%package -n maven-local
 #%package -n maven-local
 #Summary:        Macros and scripts for Maven packaging support
 #Summary:        Macros and scripts for Maven packaging support
+#Group:          Development/Tools
 #Requires:       %{name} = %{version}-%{release}
 #Requires:       %{name} = %{version}-%{release}
 #Requires:       maven
 #Requires:       maven
 #Requires:       xmvn >= 1.0.0-0.1
 #Requires:       xmvn >= 1.0.0-0.1
@@ -76,7 +77,7 @@ This package provides macros and scripts to support Java packaging.
 %package -n python-javapackages
 %package -n python-javapackages
 Summary:        Module for handling various files for Java packaging
 Summary:        Module for handling various files for Java packaging
 Summary(ja):    Java パッケージのファイルを処理するための Python モジュール
 Summary(ja):    Java パッケージのファイルを処理するための Python モジュール
-Group:          System Environment/Base
+Group:          Development/Tools
 Requires:       python-lxml
 Requires:       python-lxml
 
 
 %description -n python-javapackages
 %description -n python-javapackages
@@ -101,6 +102,8 @@ pushd python
 popd
 popd
 
 
 %install
 %install
+rm -rf $RPM_BUILD_ROOT
+
 ./install
 ./install
 sed -e 's/.[17]$/&.gz/' -e 's/.py$/&*/' -i files-*
 sed -e 's/.[17]$/&.gz/' -e 's/.py$/&*/' -i files-*
 sed -i '/%dir \/usr\/lib\/rpm\/fileattrs/d' files-common
 sed -i '/%dir \/usr\/lib\/rpm\/fileattrs/d' files-common
@@ -121,11 +124,18 @@ rm -rf %{buildroot}/%{_datadir}/fedora-review/
 #popd
 #popd
 
 
 
 
+%clean
+rm -rf $RPM_BUILD_ROOT
 
 
 %files -f files-common
 %files -f files-common
 %doc LICENSE
 %doc LICENSE
+%exclude %{_sysconfdir}/rpm/macros.fjava
+%exclude /usr/lib/rpm/maven.*
+%exclude /usr/lib/rpm/osgi.*
+%exclude /usr/lib/rpm/fileattrs/maven.attr
+%exclude /usr/lib/rpm/fileattrs/osgi.attr
 
 
-#files -n maven-local -f files-maven
+#%files -n maven-local -f files-maven
 
 
 %files -n python-javapackages
 %files -n python-javapackages
 %doc LICENSE
 %doc LICENSE
@@ -133,6 +143,11 @@ rm -rf %{buildroot}/%{_datadir}/fedora-review/
 
 
 
 
 %changelog
 %changelog
+* Sat Jan 24 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> - 3.4.1-7
+- added %%clean section
+- excluded some rpm stuffs relating to maven and osgi
+- moved to Development/Tools Group
+
 * Wed Oct 29 2014 Ryoichi INAGAKI <ryo1@toki.waseda.jp> - 3.4.1-6
 * Wed Oct 29 2014 Ryoichi INAGAKI <ryo1@toki.waseda.jp> - 3.4.1-6
 - Initial build for Vine Linux (do not generate maven-lodal)
 - Initial build for Vine Linux (do not generate maven-lodal)
 
 

+ 284 - 0
r/regexp/regexp-vl.spec

@@ -0,0 +1,284 @@
+Name:           regexp
+Version:        1.5
+Release:        19%{?_dist_release}
+Summary:        Simple regular expressions API
+Summary(ja):    シンプルな正規表現 API
+
+License:        ASL 2.0
+Group:          Development/Libraries
+URL:            http://jakarta.apache.org/%{name}/
+
+Source0:        http://archive.apache.org/dist/jakarta/%{name}/jakarta-%{name}-%{version}.tar.gz
+
+BuildArch:      noarch
+BuildRoot:      %{_tmppath}/%{name}-%{version}-root
+BuildRequires:  ant
+
+Requires:       java-headless
+
+%description
+Regexp is a 100% Pure Java Regular Expression package that was
+graciously donated to the Apache Software Foundation by Jonathan Locke.
+He originally wrote this software back in 1996 and it has stood up quite
+well to the test of time.
+It includes complete Javadoc documentation as well as a simple Applet
+for visual debugging and testing suite for compatibility.
+
+%package javadoc
+Summary:        Javadoc for %{name}
+Summary(ja):    %{name} の Javadoc
+Group:          Documentation
+
+%description javadoc
+Javadoc for %{name}.
+
+%prep
+%setup -q -n jakarta-%{name}-%{version}
+# remove all binary libs
+find . -name "*.jar" -exec rm -f {} \;
+
+%build
+mkdir lib
+%ant -Djakarta-site2.dir=. jar javadocs
+
+%install
+rm -rf $RPM_BUILD_ROOT
+
+# jars
+install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
+install -m 644 build/*.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
+
+# javadoc
+install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+cp -pr docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+
+#add_maven_depmap jakarta-%{name}:jakarta-%{name}:%{version} -a %{name}:%{name} %{name}.jar
+
+%check
+%ant -Djakarta-site2.dir=. test
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+
+#files -f .mfiles
+%files 
+%defattr(-,root,root,-)
+%doc LICENSE
+%{_javadir}/%{name}.jar
+
+%files javadoc
+%defattr(-,root,root,-)
+%doc LICENSE
+%{_javadocdir}/%{name}
+
+%changelog
+* Sat Jan 24 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> - 1.5-19
+- Initial build for Vine Linux
+
+* Wed Jul  9 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:1.5-18
+- Bump epoch as workaround for koji-shadow limitation
+
+* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.5-17
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Mon Jun  2 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.5-16
+- Fix dist tag
+
+* Mon May 12 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.5-15
+- Update to current packaging guidelines
+- Resolves: rhbz#976723
+
+* Tue Mar 04 2014 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0:1.5-14
+- Use Requires: java-headless rebuild (#1067528)
+
+* Fri Jul 26 2013 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0:1.5-13
+- Rebuild for #988462
+
+* Tue Jul 23 2013 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0:1.5-12
+- Enable testsuite
+
+* Fri Jun 28 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:1.5-11
+- Rebuild to regenerate API documentation
+- Resolves: CVE-2013-1571
+
+* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.5-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
+* Wed Oct 31 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:1.5-9
+- Install LICENSE file with javadoc package
+- Add maven POM file
+- Update to current packaging guidelines
+- Convert versioned JAR to unversioned
+
+* Sat Jul 21 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.5-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.5-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.5-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Wed Oct 6 2010 Alexander Kurtakov <akurtako@redhat.com> 0:1.5-5
+- Drop gcj support.
+
+* Fri Jan 08 2010 Andrew Overholt <overholt@redhat.com> 1.5-4.3
+- Remove javadoc ghost symlinking.
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.5-4.2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.5-3.2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Thu Jul 10 2008 Tom "spot" Callaway <tcallawa@redhat.com> - 0:1.5-2.2
+- drop repotag
+
+* Mon Feb 18 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 0:1.5-2jpp.1
+- Autorebuild for GCC 4.3
+
+* Sat Feb 9 2008 Devrim GUNDUZ <devrim@commandprompt.com> 0:1.5-1jpp.1
+- Update to 1.5
+- Fix license
+- Cosmetic cleanup
+
+* Thu Feb 8 2007 Vivek Lakshmanan <vivekl at redhat.com> 0:1.4-3jpp.1.fc7
+- Resync with JPP
+- Use the upstream tar ball as JPP does since they clean it off jars anyway
+- Use JPackage exception compliant naming scheme
+- Remove section definition
+- Install unversioned symlink
+- Add missing ghost for unversioned link
+- Add requires on java
+
+* Fri Aug 4 2006 Vivek Lakshmanan <vivekl@redhat.com> 0:1.4-2jpp.2
+- Rebuild.
+
+* Fri Aug 4 2006 Vivek Lakshmanan <vivekl@redhat.com> 0:1.4-2jpp.1
+- Merge with latest from JPP.
+- Remove prebuilt jars from new source tar ball.
+
+* Sat Jul 22 2006 Jakub Jelinek <jakub@redhat.com> - 0:1.3-2jpp_9fc
+- Rebuilt
+
+* Wed Jul 12 2006 Jesse Keating <jkeating@redhat.com> - 0:1.3-2jpp_8fc
+- rebuild
+
+* Mon Mar  6 2006 Jeremy Katz <katzj@redhat.com> - 0:1.3-2jpp_7fc
+- stop scriptlet spew
+
+* Fri Feb 10 2006 Jesse Keating <jkeating@redhat.com> - 0:1.3-2jpp_6fc
+- bump again for double-long bug on ppc(64)
+
+* Tue Feb 07 2006 Jesse Keating <jkeating@redhat.com> - 0:1.3-2jpp_5fc
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
+* Wed Dec 21 2005 Jesse Keating <jkeating@redhat.com> 0:1.2-2jpp_4fc
+- rebuilt again
+
+* Tue Dec 13 2005 Jesse Keating <jkeating@redhat.com>
+- rebuilt for new gcj
+
+* Fri Dec 09 2005 Jesse Keating <jkeating@redhat.com>
+- rebuilt
+
+* Fri Jul 15 2005 Gary Benson <gbenson@redhat.com> 0:1.3-2jpp_3fc
+- Build on ia64, ppc64, s390 and s390x.
+- Switch to aot-compile-rpm.
+
+* Tue Jun 14 2005 Gary Benson <gbenson@redhat.com> 0:1.3-2jpp_2fc
+- Remove jarfile from the tarball.
+
+* Thu May 26 2005 Gary Benson <gbenson@redhat.com> 0:1.3-2jpp_1fc
+- Upgrade to 1.3-2jpp.
+- Rearrange how BC-compiled stuff is built and installed.
+
+* Mon May 23 2005 Gary Benson <gbenson@redhat.com> 0:1.3-1jpp_6fc
+- Add alpha to the list of build architectures (#157522).
+- Use absolute paths for rebuild-gcj-db.
+
+* Thu May  5 2005 Gary Benson <gbenson@redhat.com> 0:1.3-1jpp_5fc
+- BC-compile.
+
+* Tue Jan 11 2005 Gary Benson <gbenson@redhat.com> 0:1.3-1jpp_4fc
+- Sync with RHAPS.
+
+* Thu Nov  4 2004 Gary Benson <gbenson@redhat.com> 0:1.3-1jpp_3fc
+- Build into Fedora.
+
+* Fri Oct  1 2004 Andrew Overholt <overholt@redhat.com> 0:1.3-1jpp_3rh
+- add coreutils BuildRequires
+
+* Wed Aug 25 2004 Fernando Nasser <fnasser@redhat.com> 0:1.3-2jpp
+- Require Ant > 1.6
+- Rebuild with Ant 1.6.2
+
+* Fri Mar 26 2004 Frank Ch. Eigler <fche@redhat.com> 0:1.3-1jpp_2rh
+- add RHUG upgrade cleanup
+
+* Thu Mar  3 2004 Frank Ch. Eigler <fche@redhat.com> 0:1.3-1jpp_1rh
+- RH vacuuming
+
+* Thu Oct 09 2003 Henri Gomez <hgomez at users.sourceforge.net> 0:1.3-1jpp
+- regexp 1.3
+
+* Fri May 09 2003 David Walluck <david@anti-microsoft.org> 0:1.2-14jpp
+- update for JPackage 1.5
+
+* Fri Mar 23 2003 Nicolas Mailhot <Nicolas.Mailhot (at) JPackage.org> 1.2-13jpp
+- for jpackage-utils 1.5
+
+* Tue Jul 02 2002 Guillaume Rousse <guillomovitch@users.sourceforge.net> 1.2-11jpp
+- section marcro
+- removed additional symlink
+
+* Mon Jun 24 2002 Henri Gomez <hgomez@slib.fr> 1.2-10jpp
+- add official jakarta jarname (jakarta-regexp-1.2.jar) symlink to real
+  jarname
+
+* Mon Jun 10 2002 Henri Gomez <hgomez@slib.fr> 1.2-9jpp
+- use sed instead of bash 2.x extension in link area to make spec compatible
+  with distro using bash 1.1x
+- use official tarball
+
+* Fri Jan 18 2002 Guillaume Rousse <guillomovitch@users.sourceforge.net> 1.2-8jpp 
+- versioned dir for javadoc
+- no dependencies javadoc package
+
+* Sat Dec 1 2001 Guillaume Rousse <guillomovitch@users.sourceforge.net> 1.2-7jpp
+- javadoc in javadoc package
+- official summary
+
+* Wed Nov 21 2001 Christian Zoffoli <czoffoli@littlepenguin.org> 1.2-5jpp
+- removed packager tag
+- new jpp extension
+
+* Sun Sep 30 2001 Guillaume Rousse <guillomovitch@users.sourceforge.net> 1.2-5jpp
+- first unified release
+- s/jPackage/JPackage
+
+* Sun Aug 26 2001 Guillaume Rousse <guillomovitch@users.sourceforge.net> 1.2-4mdk
+- vendor tag
+- packager tag
+- s/Copyright/License/
+- truncated description to 72 columns in spec
+- spec cleanup
+- used versioned jar
+- used new source packaging policy
+
+* Sat Feb 17 2001 Guillaume Rousse <g.rousse@linux-mandrake.com> 1.2-3mdk
+- spec cleanup
+- changelog correction
+
+* Sun Feb 04 2001 Guillaume Rousse <g.rousse@linux-mandrake.com> 1.2-2mdk
+- merged with Henri Gomez <hgomez@slib.fr> specs:
+- changed name to regexp
+-  changed javadir to /usr/share/java
+-  dropped jdk & jre requirement
+-  added Jikes support
+- changed jar name to regexp.jar
+- corrected doc
+
+* Sun Jan 14 2001 Guillaume Rousse <g.rousse@linux-mandrake.com> 1.2-1mdk
+- first Mandrake release

+ 13 - 8
x/xalan-c/xalan-c-vl.spec

@@ -1,8 +1,9 @@
 Summary:        Xalan XSLT processor for C
 Summary:        Xalan XSLT processor for C
+Summary(ja):    C 言語用 Xalan XSLT プロセッサ
 
 
 Name:           xalan-c
 Name:           xalan-c
 Version:        1.11.0
 Version:        1.11.0
-Release:        1%{?_dist_release}
+Release:        2%{?_dist_release}
 
 
 Group:          System Environment/Libraries
 Group:          System Environment/Libraries
 License:        ASL 2.0
 License:        ASL 2.0
@@ -11,7 +12,6 @@ Source0:        http://www.us.apache.org/dist/xalan/xalan-c/sources/xalan_c-1.11
 Patch0:         xalan-c-1.10.0-escaping.patch
 Patch0:         xalan-c-1.10.0-escaping.patch
 
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-
 BuildRequires:  xerces-c-devel
 BuildRequires:  xerces-c-devel
 Requires(post): /sbin/ldconfig
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
@@ -20,23 +20,21 @@ Requires(postun): /sbin/ldconfig
 Xalan is an XSLT processor for transforming XML documents into HTML, text, or
 Xalan is an XSLT processor for transforming XML documents into HTML, text, or
 other XML document types.
 other XML document types.
 
 
-
 %package        devel
 %package        devel
-Summary:        Header files, libraries and development documentation for %{name}
+Summary:        Header files, libraries for %{name}
+Summary(ja):    %{name} のヘッダファイルとライブラリ
 Group:          Development/Libraries
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
 Requires:       %{name} = %{version}-%{release}
 
 
-
 %description devel
 %description devel
 This package contains the header files, static libraries and development
 This package contains the header files, static libraries and development
 documentation for %{name}. If you like to develop programs using %{name},
 documentation for %{name}. If you like to develop programs using %{name},
 you will need to install %{name}-devel.
 you will need to install %{name}-devel.
 
 
-
 %package doc
 %package doc
+Summary:        Documentation for Xalan XSLT processor
+Summary(ja):    Xalan XSLT プロセッサのドキュメント
 Group:          Documentation
 Group:          Documentation
-Summary:        Documentation for Xerces-C++ validating XML parser
-
 
 
 %description doc
 %description doc
 Documentation for %{name}.
 Documentation for %{name}.
@@ -48,6 +46,9 @@ Documentation for %{name}.
 find -type d -name CVS -print0 | xargs -0 rm -rf
 find -type d -name CVS -print0 | xargs -0 rm -rf
 chmod 644 NOTICE
 chmod 644 NOTICE
 
 
+# Update config.guess for new architectures
+cp /usr/lib/rpm/config.guess config.guess
+
 
 
 %build
 %build
 export XALANCROOT="${PWD}"
 export XALANCROOT="${PWD}"
@@ -96,6 +97,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 
 
 %changelog
 %changelog
+* Sat Jan 24 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 1.11.0-2
+- rebuilt with xerces-c 3.1.1
+- added Japanese summary
+
 * Mon Jul 14 2014 Daisuke SUZUKI <daisuke@vinelinux.org> 1.11.0-1
 * Mon Jul 14 2014 Daisuke SUZUKI <daisuke@vinelinux.org> 1.11.0-1
 - update to 1.11.0
 - update to 1.11.0
 
 

+ 148 - 118
x/xerces-j2/xerces-j2-vl.spec

@@ -1,45 +1,68 @@
-%global cvs_version 2_9_0
+%global cvs_version 2_11_0
 
 
 Name:          xerces-j2
 Name:          xerces-j2
 Summary:       Java XML parser
 Summary:       Java XML parser
 Summary(ja):   Java XML パーサ
 Summary(ja):   Java XML パーサ
-Version:       2.9.0
-Release:       5%{?_dist_release}
+Version:       2.11.0
+Release:       1%{?_dist_release}
 
 
 Group:         Development/Libraries
 Group:         Development/Libraries
 License:       ASL 2.0
 License:       ASL 2.0
 URL:           http://xerces.apache.org/xerces2-j/
 URL:           http://xerces.apache.org/xerces2-j/
 
 
-# using binary for bootstrap
-Source0:       http://archive.apache.org/dist/xml/xerces-j/Xerces-J-bin.%{version}.tar.gz
-#Source0:       http://archive.apache.org/dist/xml/xerces-j/source/Xerces-J-src.%{version}.tar.gz
+Source0:       http://mirror.ox.ac.uk/sites/rsync.apache.org/xerces/j/source/Xerces-J-src.%{version}.tar.gz
 Source1:       %{name}-version.sh
 Source1:       %{name}-version.sh
 Source2:       %{name}-constants.sh
 Source2:       %{name}-constants.sh
+Source11:      %{name}-version.1
+Source12:      %{name}-constants.1
+
+# Custom javac ant task used by the build
+Source3:       https://svn.apache.org/repos/asf/xerces/java/tags/Xerces-J_%{cvs_version}/tools/src/XJavac.java
+
+# Custom doclet tags used in javadocs
+Source5:       https://svn.apache.org/repos/asf/xerces/java/tags/Xerces-J_%{cvs_version}/tools/src/ExperimentalTaglet.java
+Source6:       https://svn.apache.org/repos/asf/xerces/java/tags/Xerces-J_%{cvs_version}/tools/src/InternalTaglet.java
+
+Source7:       %{name}-pom.xml
+
+# Patch the build so that it doesn't try to use bundled xml-commons source
+Patch0:        %{name}-build.patch
+
+# Patch the manifest so that it includes OSGi stuff
+Patch1:        %{name}-manifest.patch
+
+# Backported fix from upstream http://svn.apache.org/viewvc?view=revision&revision=1499506
+# See https://bugzilla.redhat.com/show_bug.cgi?id=1140031
+Patch2:        xerces-j2-CVE-2013-4002.patch
 
 
 
 
 BuildRoot:     %{_tmppath}/%{name}-%{version}-root
 BuildRoot:     %{_tmppath}/%{name}-%{version}-root
 BuildArch:     noarch
 BuildArch:     noarch
-
-#BuildRequires: java-devel >= 1:1.6.0
-#BuildRequires: jpackage-utils
-#BuildRequires: xml-commons-apis >= 1.3
-#BuildRequires: xml-commons-resolver >= 1.1
-#BuildRequires: ant
-#BuildRequires: xalan-j2
-#BuildRequires: xml-stylebook
-#BuildRequires: jaxp_parser_impl
+BuildRequires: java-devel >= 1.6.0
+BuildRequires: javapackages-tools >= 3.4.1-7vl7
+BuildRequires: xalan-j2 >= 2.7.1
+BuildRequires: xml-commons-apis >= 1.4.01
+BuildRequires: xml-commons-resolver >= 1.2
+BuildRequires: ant
+BuildRequires: jaxp_parser_impl
 #BuildRequires: dejavu-sans-fonts
 #BuildRequires: dejavu-sans-fonts
-Requires:      java
-Requires:      jpackage-utils
-Requires:      xml-commons-apis >= 1.3
-#Requires:      xml-commons-resolver >= 1.1
+Requires:      java-headless
+Requires:      javapackages-tools
+Requires:      xalan-j2 >= 2.7.1
+Requires:      xml-commons-apis >= 1.4.01
+Requires:      xml-commons-resolver >= 1.2
+
+Provides:      jaxp_parser_impl = 1.4
+Provides:      %{name}-scripts = %{version}-%{release}
+Obsoletes:     %{name}-scripts < 2.9.0-5
 
 
-Provides:      jaxp_parser_impl = 1.3
 Requires(post):  alternatives jaxp_parser_impl
 Requires(post):  alternatives jaxp_parser_impl
 Requires(preun): alternatives jaxp_parser_impl
 Requires(preun): alternatives jaxp_parser_impl
 
 
 # This documentation is provided by xml-commons-apis
 # This documentation is provided by xml-commons-apis
-#Obsoletes:     %{name}-javadoc-apis < %{version}-%{release}
+Obsoletes:     %{name}-javadoc-apis < %{version}-%{release}
+# http://mail-archives.apache.org/mod_mbox/xerces-j-dev/201008.mbox/%3COF8D7E2F83.0271A181-ON8525777F.00528302-8525777F.0054BBE0@ca.ibm.com%3E
+Obsoletes:     %{name}-manual < %{version}-%{release}
 
 
 %description
 %description
 Welcome to the future! Xerces2 is the next generation of high performance,
 Welcome to the future! Xerces2 is the next generation of high performance,
@@ -68,86 +91,109 @@ also handles namespaces according to the XML Namespaces 1.1 Recommendation,
 and will correctly serialize XML 1.1 documents if the DOM level 3 load/save
 and will correctly serialize XML 1.1 documents if the DOM level 3 load/save
 APIs are in use.
 APIs are in use.
 
 
-#%package        javadoc-impl
-#Summary:        Javadoc for %{name} implementation
-#Group:          Documentation
-#
-#%description    javadoc-impl
-#%{summary}.
-
-#%package        javadoc-xs
-#Summary:        Javadoc for %{name} XML schema API
-#Group:          Documentation
-#
-#%description    javadoc-xs
-#%{summary}.
-
-#%package        javadoc-xni
-#Summary:        Javadoc for %{name} XNI
-#Group:          Documentation
-#
-#%description    javadoc-xni
-#%{summary}.
-
-#%package        javadoc-other
-#Summary:        Javadoc for other %{name} components
-#Group:          Documentation
-#
-#%description    javadoc-other
-#%{summary}.
-
-#%package        manual
-#Summary:        Manual for %{name}
-#Group:          Documentation
-#Requires:       xml-commons-apis-javadoc
-#Requires:       %{name}-javadoc-impl = %{version}-%{release}
-#Requires:       %{name}-javadoc-xs = %{version}-%{release}
-#Requires:       %{name}-javadoc-xni = %{version}-%{release}
-#Requires:       %{name}-javadoc-other = %{version}-%{release}
-#
-#%description    manual
-#%{summary}.
-
-#%package        demo
-#Summary:        Demonstrations and samples for %{name}
-#Group:          Development/Libraries
-#Requires:       %{name} = %{version}-%{release}
-#
-#%description    demo
-#%{summary}.
-
-#%package        scripts
-#Summary:        Additional utility scripts for %{name}
-#Group:          Development/Libraries
-#Requires:       %{name} = %{version}-%{release}
-#
-#%description    scripts
-#%{summary}.
+%package        javadoc
+Summary:        Javadocs for %{name}
+Group:          Documentation
+Requires:       javapackages-tools
+
+# Consolidating all javadocs into one package
+Obsoletes:      %{name}-javadoc-impl < %{version}-%{release}
+Obsoletes:      %{name}-javadoc-xs < %{version}-%{release}
+Obsoletes:      %{name}-javadoc-xni < %{version}-%{release}
+Obsoletes:      %{name}-javadoc-other < %{version}-%{release}
+
+%description    javadoc
+This package contains the API documentation for %{name}.
+
+%package        demo
+Summary:        Demonstrations and samples for %{name}
+Group:          Development/Libraries
+Requires:       %{name} = %{version}-%{release}
+
+%description    demo
+%{summary}.
+
 
 
 %prep
 %prep
-%setup -q -n xerces-2_9_0
-#patch0 -p0 -b .orig
+%setup -q -n xerces-%{cvs_version}
+%patch0 -p0 -b .orig
+%patch1 -p0 -b .orig
+%patch2 -p0 -b .orig
+
+# Copy the custom ant tasks into place
+mkdir -p tools/org/apache/xerces/util
+mkdir -p tools/bin
+cp -a %{SOURCE3} %{SOURCE5} %{SOURCE6} tools/org/apache/xerces/util
+
+# Make sure upstream hasn't sneaked in any jars we don't know about
+find -name '*.class' -exec rm -f '{}' \;
+find -name '*.jar' -exec rm -f '{}' \;
+
+sed -i 's/\r//' LICENSE README NOTICE
 
 
 %build
 %build
+pushd tools
+
+# Build custom ant tasks
+javac -classpath $(build-classpath ant) org/apache/xerces/util/XJavac.java
+jar cf bin/xjavac.jar org/apache/xerces/util/XJavac.class
+
+# Build custom doc taglets
+javac -classpath /usr/lib/jvm/java/lib/tools.jar org/apache/xerces/util/*Taglet.java
+jar cf bin/xerces2taglets.jar org/apache/xerces/util/*Taglet.class
+
+ln -sf $(build-classpath xalan-j2-serializer) serializer.jar
+ln -sf $(build-classpath xml-commons-apis) xml-apis.jar
+ln -sf $(build-classpath xml-commons-resolver) resolver.jar
+ln -sf $(build-classpath xerces-j2) x.jar
+popd
+
+# Build everything
+export ANT_OPTS="-Xmx256m -Djava.endorsed.dirs=$(pwd)/tools -Djava.awt.headless=true -Dbuild.sysclasspath=first -Ddisconnected=true"
+ant -Djavac.source=1.5 -Djavac.target=1.5 \
+    -Dbuild.compiler=modern \
+    clean jars javadocs
 
 
 %install
 %install
 rm -rf $RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT
 
 
 # jars
 # jars
-install -pD -T xercesImpl.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
-(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
+install -pD -T build/xercesImpl.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
+
+# javadoc
+mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}/impl
+mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}/xs
+mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}/xni
+mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}/other
+
+cp -pr build/docs/javadocs/xerces2/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}/impl
+cp -pr build/docs/javadocs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}/xs
+cp -pr build/docs/javadocs/xni/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}/xni
+cp -pr build/docs/javadocs/other/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}/other
 
 
 # scripts
 # scripts
 install -pD -m755 -T %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/%{name}-version
 install -pD -m755 -T %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/%{name}-version
 install -pD -m755 -T %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}/%{name}-constants
 install -pD -m755 -T %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}/%{name}-constants
 
 
+# manual pages
+install -d -m 755 $RPM_BUILD_ROOT%{_mandir}/man1
+install -p -m 644 %{SOURCE11} $RPM_BUILD_ROOT%{_mandir}/man1
+install -p -m 644 %{SOURCE12} $RPM_BUILD_ROOT%{_mandir}/man1
+
 # demo
 # demo
-#install -pD -T xercesSamples.jar $RPM_BUILD_ROOT%{_datadir}/%{name}/%{name}-samples.jar
-#cp -pr data $RPM_BUILD_ROOT%{_datadir}/%{name}
+install -pD -T build/xercesSamples.jar $RPM_BUILD_ROOT%{_datadir}/%{name}/%{name}-samples.jar
+cp -pr data $RPM_BUILD_ROOT%{_datadir}/%{name}
+
+# Pom
+#install -pD -T -m 644 %{SOURCE7} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
+
+# Depmap with legacy depmaps for compatability
+#add_maven_depmap JPP-%{name}.pom %{name}.jar -a "xerces:xerces,xerces:xmlParserAPIs,apache:xerces-j2"
 
 
 # jaxp_parser_impl ghost symlink
 # jaxp_parser_impl ghost symlink
-#ln -s %{_sysconfdir}/alternatives \
-#  $RPM_BUILD_ROOT%{_javadir}/jaxp_parser_impl.jar
+ln -s %{_sysconfdir}/alternatives \
+   $RPM_BUILD_ROOT%{_javadir}/jaxp_parser_impl.jar
 
 
 %clean
 %clean
 rm -rf $RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT
@@ -164,44 +210,28 @@ fi
 
 
 %files
 %files
 %defattr(-,root,root,-)
 %defattr(-,root,root,-)
-%doc LICENSE NOTICE
+%doc LICENSE NOTICE README
 %{_javadir}/%{name}*
 %{_javadir}/%{name}*
-#ghost %{_javadir}/jaxp_parser_impl.jar
-
-#%files javadoc-impl
-#%defattr(-,root,root,-)
-#%{_javadocdir}/%{name}-impl-%{version}
-#%{_javadocdir}/%{name}-impl
-
-#%files javadoc-xs
-#%defattr(-,root,root,-)
-#%{_javadocdir}/%{name}-xs-%{version}
-#%{_javadocdir}/%{name}-xs
-
-#%files javadoc-other
-#%defattr(-,root,root,-)
-#%{_javadocdir}/%{name}-other-%{version}
-#%{_javadocdir}/%{name}-other
-
-#%files javadoc-xni
-#%defattr(-,root,root,-)
-#%{_javadocdir}/%{name}-xni-%{version}
-#%{_javadocdir}/%{name}-xni
-
-#%files manual
-#%defattr(-,root,root,-)
-#%dir %{_docdir}/%{name}-%{version}
-#%{_docdir}/%{name}-%{version}/manual
-
-#%files demo
-#%defattr(-,root,root,-)
-#%{_datadir}/%{name}
-
-#%files scripts
-#%defattr(-,root,root,-)
 %{_bindir}/*
 %{_bindir}/*
+%{_mandir}/*/*
+%ghost %{_javadir}/jaxp_parser_impl.jar
+
+%files javadoc
+%defattr(-,root,root,-)
+%{_javadocdir}/%{name}
+
+%files demo
+%defattr(-,root,root,-)
+%{_datadir}/%{name}
+
 
 
 %changelog
 %changelog
+* Sat Jan 24 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> - 2.11.0-1
+- updated to 2.11.0
+
+* Sat Feb 04 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> - 2.9.0-6
+- rebuild with Vine6 environment
+
 * Fri Aug 27 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 2.9.0-5
 * Fri Aug 27 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 2.9.0-5
 - Initial build for Vine Linux
 - Initial build for Vine Linux
 
 

+ 232 - 0
x/xml-commons-resolver/xml-commons-resolver-vl.spec

@@ -0,0 +1,232 @@
+Name:           xml-commons-resolver
+Version:        1.2
+Release:        18%{?_dist_release}
+Summary:        Resolver subproject of xml-commons
+
+License:        ASL 2.0
+Group:          Development/Libraries
+URL:            http://xerces.apache.org/xml-commons/components/resolver/
+
+Source0:        http://www.apache.org/dist/xerces/xml-commons/%{name}-%{version}.tar.gz
+Source5:        %{name}-pom.xml
+Source6:        %{name}-resolver.1
+Source7:        %{name}-xparse.1
+Source8:        %{name}-xread.1
+Patch0:         %{name}-1.2-crosslink.patch
+Patch1:         %{name}-1.2-osgi.patch
+
+BuildArch:      noarch
+BuildRoot:      %{_tmppath}/%{name}-%{version}-root
+BuildRequires:  java-devel >= 1.6.0
+BuildRequires:  ant
+BuildRequires:  javapackages-tools
+Requires:       java-headless >= 1.6.0
+Requires:       javapackages-tools
+
+%description
+Resolver subproject of xml-commons.
+
+%package javadoc
+Summary:        Javadoc for %{name}
+Group:          Documentation
+BuildRequires:  java-javadoc
+Requires:       java-javadoc
+
+%description javadoc
+Javadoc for %{name}.
+
+%prep
+%setup -q
+%patch0 -p1
+%patch1 -p1
+
+# remove all binary libs and prebuilt javadocs
+find . -name "*.jar" -exec rm -f {} \;
+rm -rf docs
+sed -i 's/\r//' KEYS LICENSE.resolver.txt NOTICE-resolver.txt
+
+%build
+%ant -f resolver.xml jar javadocs
+
+%install
+rm -rf $RPM_BUILD_ROOT
+
+# Jars
+install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
+install -p -m 644 build/resolver.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
+ln -s %{name}.jar $RPM_BUILD_ROOT%{_javadir}/xml-resolver.jar
+
+# Javadocs
+mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+cp -pr build/apidocs/resolver/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+
+# Scripts
+mkdir -p $RPM_BUILD_ROOT%{_bindir}
+%jpackage_script org.apache.xml.resolver.apps.resolver "" "" %{name} xml-resolver true
+%jpackage_script org.apache.xml.resolver.apps.xread "" "" %{name} xml-xread true
+%jpackage_script org.apache.xml.resolver.apps.xparse "" "" %{name} xml-xparse true
+
+# Man pages
+install -d -m 755 ${RPM_BUILD_ROOT}%{_mandir}/man1
+install -p -m 644 %{SOURCE6} ${RPM_BUILD_ROOT}%{_mandir}/man1/xml-resolver.1
+install -p -m 644 %{SOURCE7} ${RPM_BUILD_ROOT}%{_mandir}/man1/xml-xparse.1
+install -p -m 644 %{SOURCE8} ${RPM_BUILD_ROOT}%{_mandir}/man1/xml-xread.1
+
+# Pom
+#install -d -m 755 %{buildroot}%{_mavenpomdir}
+#install -p -m 644 %{SOURCE5} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
+#add_maven_depmap JPP-%{name}.pom %{name}.jar
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+#files -f .mfiles
+%files
+%doc KEYS LICENSE.resolver.txt NOTICE-resolver.txt
+#{_mavenpomdir}/*
+%{_javadir}/*
+%{_mandir}/man1/*
+%{_bindir}/xml-*
+
+%files javadoc
+%{_javadocdir}/%{name}
+%doc LICENSE.resolver.txt NOTICE-resolver.txt
+
+%changelog
+* Sat Jan 24 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 1.2-18
+- Initial build for Vine Linux
+
+* Fri Jun 13 2014 Alexander Kurtakov <akurtako@redhat.com> 0:1.2-17
+- Fix FTBFS.
+
+* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.2-16
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Mon Dec 23 2013 Ville Skyttä <ville.skytta@iki.fi> - 0:1.2-15
+- Use %%jpackage_script to generate scripts.
+- Add OSGi metadata to manifest instead of discarding everything else in it.
+- Drop dependency on xml-commons-api, add one on java(-headless).
+- Crosslink javadocs with Java's.
+- Include NOTICE* in docs.
+- Update URLs.
+- Specfile cleanups.
+
+* Thu Aug 15 2013 Mat Booth <fedora@matbooth.co.uk> - 0:1.2-14
+- Fix FTBFS rhbz #993143
+
+* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.2-13
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
+* Thu Apr 11 2013 Michal Srb <msrb@redhat.com> - 0:1.2-12
+- Add man pages (Resolves: rhbz#949424)
+
+* Fri Feb 15 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.2-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
+* Fri Aug 17 2012 Andy Grimm <agrimm@gmail.com> - 0:1.2-10
+- Remove osgi(system.bundle) requirement
+
+* Sun Jul 22 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.2-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.2-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.2-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Wed Nov 3 2010 Alexander Kurtakov <akurtako@redhat.com> 0:1.2-6
+- Fix merge review comments (bug#226564).
+
+* Wed Nov 3 2010 Alexander Kurtakov <akurtako@redhat.com> 0:1.2-5
+- Add missing zip BR.
+- Remove perl and dos2unix usage.
+- Fix license - ASL 2.0 now.
+
+* Fri Sep 24 2010 Mat Booth <fedora@matbooth.co.uk> 0:1.2-4
+- Forgot to actually install a jar with a name that maven users expect.
+
+* Sun Sep 19 2010 Mat Booth <fedora@matbooth.co.uk> 0:1.2-3
+- Install a maven pom and depmap.
+
+* Wed Apr 7 2010 Alexander Kurtakov <akurtako@redhat.com> 0:1.2-2
+- No need to require jaxp_parser_impl now that we require java 1.5 or newer.
+
+* Fri Mar 5 2010 Alexander Kurtakov <akurtako@redhat.com> 0:1.2-1
+- Update to 1.2.
+- Drop gcj_support.
+
+* Mon Jan 11 2010 Andrew Overholt <overholt@redhat.com> 0:1.1-4.17
+- Fix Group tags
+- Remove '.' at end of Summary
+- Add dos2unix BR and fix line endings
+- Use upstream tarball
+
+* Sat Aug  8 2009 Ville Skyttä <ville.skytta@iki.fi> - 0:1.1-4.16
+- Fix specfile UTF-8 encoding.
+
+* Mon Jul 27 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.1-4.15
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.1-3.15
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Fri Jan 30 2009 Alexander Kurtakov <akurtako@redhat.com> 0:1.1-2.15
+- Install osgi manifest for eclipse-dtp
+
+* Fri Sep 05 2008 Deepak Bhole <dbhole@redhat.com> 1.1-2.14
+- Build with IcedTea to escape sinjdoc issues
+
+* Thu Jul 10 2008 Tom "spot" Callaway <tcallawa@redhat.com> - 0:1.1-2.13
+- drop repotag
+- fix license tag
+
+* Mon Feb 18 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 0:1.1-2jpp.12
+- Autorebuild for GCC 4.3
+
+* Thu Aug 10 2006 Deepak Bhole <dbhole@redhat.com> 1.1-1jpp.12
+- Added missing dependencies.
+
+* Sat Jul 22 2006 Jakub Jelinek <jakub@redhat.com> - 0:1.1-1jpp_11fc
+- Rebuilt
+
+* Fri Jul 21 2006 Deepak Bhole <dbhole@redhat.com> - 0:1.1-1jpp_10fc
+- Added conditional native compilation.
+
+* Wed Jul 12 2006 Jesse Keating <jkeating@redhat.com> - 0:1.1-1jpp_9fc
+- rebuild
+
+* Mon Mar  6 2006 Jeremy Katz <katzj@redhat.com> - 0:1.1-1jpp_8fc
+- stop scriptlet spew
+
+* Wed Dec 21 2005 Jesse Keating <jkeating@redhat.com> 0:1.1-1jpp_7fc
+- rebuilt again
+
+* Fri Dec 09 2005 Jesse Keating <jkeating@redhat.com> 0:1.1-1jpp_6fc
+- rebuilt
+
+* Tue Jun 28 2005 Gary Benson <gbenson@redhat.com> 0:1.1-1jpp_5fc
+- Remove jarfile from the tarball.
+
+* Thu Nov  4 2004 Gary Benson <gbenson@redhat.com> 0:1.1-1jpp_4fc
+- Build into Fedora.
+
+* Thu Oct 28 2004 Gary Benson <gbenson@redhat.com> 0:1.1-1jpp_3fc
+- Bootstrap into Fedora.
+
+* Thu Mar  4 2004 Frank Ch. Eigler <fche@redhat.com> 0:1.1-1jpp_2rh
+- RH vacuuming part II
+
+* Wed Mar  3 2004 Frank Ch. Eigler <fche@redhat.com> 0:1.1-1jpp_1rh
+- RH vacuuming
+
+* Wed Jan 21 2004 David Walluck <david@anti-microsoft.org> 0:1.1-1jpp
+- 1.1
+- use perl instead of patch
+- don't build docs (build fails)
+
+* Tue May 06 2003 David Walluck <david@anti-microsoft.org> 0:1.0-2jpp
+- update for JPackage 1.5
+
+* Wed Nov 13 2002 Ville Skyttä <ville.skytta@iki.fi> - 1.0-1jpp
+- Follow upstream changes, split out of xml-commons.