Browse Source

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

	* java_cup: added Patch
	* rhino, xerces-c, xml-common-apis, xmlcopyeditor: updated
	


git-svn-id: http://trac.vinelinux.org/repos/projects/specs@9288 ec354946-7b23-47d6-9f5a-488ba84defc7
inagaki 9 years ago
parent
commit
a0c14bde28

+ 60 - 31
j/java_cup/java_cup-vl.spec

@@ -30,61 +30,79 @@
 
 %define pkg_version     11a
 %define section         free
-##VINE##define with_bootstrap  0
+##define with_bootstrap  0
 %define with_bootstrap  1
 
 Name:           java_cup
-Summary:        LALR Parser Generator for Java
 Version:        0.11a
-Release:        5%{?_dist_release}
+Release:        7%{?_dist_release}
+Summary:        Java source interpreter
 
-Group:          Development/Tools
-License:        BSD and LGPLv2
+Group:          Development/Libraries
+License:        MIT
 URL:            http://www.cs.princeton.edu/%7Eappel/modern/java/CUP/
 
 #svn export -r 21 https://www2.in.tum.de/repos/cup/develop/ java_cup-0.11a 
 #tar cjf java_cup-0.11a.tar.bz2 java_cup-0.11a/
 Source0:        java_cup-0.11a.tar.bz2
 Source1:        java_cup-pom.xml
+# Add OSGi manifests
+Source2:        %{name}-MANIFEST.MF
+Source4:        %{name}-runtime-MANIFEST.MF
+# Taken from http://www2.cs.tum.edu/projects/cup/
+Source3:        LICENSE.txt
+
 Patch0:         %{name}-build.patch
+Patch1:         java_cup-0.11a-manifest.patch
+# Patch from eclipe-pdt to get around generated actions methods exceeding the 65535 bytes limit:
+# http://git.eclipse.org/c/pdt/org.eclipse.pdt.git/tree/plugins/org.eclipse.php.core.parser/javacup10k_split_do_action_method.diff
+Patch2:         javacup10k_split_do_action_method.diff
 
 BuildArch:      noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 BuildRequires:  ant
+BuildRequires:  java-devel
 BuildRequires:  jpackage-utils >= 1.5
 #BuildRequires:	jflex
 %if !%{with_bootstrap}
 BuildRequires:	java_cup >= 0.11a
 %endif
-# we still need openjdk for javadoc
-BuildRequires:  java-1.6.0-openjdk-devel
+BuildRequires:  zip
+Requires:       java-headless
 
 %description
 java_cup is a LALR Parser Generator for Java
 
 %package javadoc
-Summary:        Javadoc for java_cup
-Group:          Documentation
+Summary: Javadoc for java_cup
+Summary(ja): java_cup の Javadoc
+Group: Documentation
 
 %description javadoc
 Javadoc for java_cup
 
 %package manual
-Summary:        Documentation for java_cup
-Group:          Documentation
+Summary: Documentation for java_cup
+Summary(ja): java_cup のドキュメント
+Group: Documentation
 
 %description manual
 Documentation for java_cup.
 
 %prep
 %setup -q 
-%patch0 -b .sav
+%patch0 -b .build
+%patch1 -p1 -b .manifest
+pushd src
+%patch2 -p1 -b .orig
+popd
 cp %{SOURCE1} pom.xml
+cp %{SOURCE3} .
 
 # remove all binary files
-find . -name "*.class" -exec rm -f {} \;
+find -name "*.class" -delete
 
-%if !%{with_bootstrap}
+%if ! %{with_bootstrap}
 # remove prebuilt JFlex
 rm -rf java_cup-0.11a/bin/JFlex.jar
 
@@ -104,24 +122,29 @@ ant javadoc
 %install
 rm -rf $RPM_BUILD_ROOT
 
+# inject OSGi manifests
+mkdir -p META-INF
+cp -p %{SOURCE2} META-INF/MANIFEST.MF
+touch META-INF/MANIFEST.MF
+zip -u dist/java-cup-%{pkg_version}.jar META-INF/MANIFEST.MF
+cp -p %{SOURCE4} META-INF/MANIFEST.MF
+touch META-INF/MANIFEST.MF
+zip -u dist/java-cup-%{pkg_version}-runtime.jar META-INF/MANIFEST.MF
+
 # jar
 install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
 install -m 644 dist/java-cup-%{pkg_version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
 install -m 644 dist/java-cup-%{pkg_version}-runtime.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-runtime-%{version}.jar
-(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do \
-ln -sf ${jar} ${jar/-%{version}/}; done)
 
-# javadoc
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -pr dist/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-(cd $RPM_BUILD_ROOT%{_javadocdir} && ln -sf %{name}-%{version} %{name})
+# poms
+#install -d -m 755 %{buildroot}%{_mavenpomdir}
+#install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
+#add_maven_depmap
 
-#add_to_maven_depmap java_cup java_cup %{version} JPP java_cup
+# javadoc
+install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+cp -pr dist/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
-# poms
-install -d -m 755 %{buildroot}%{_mavenpomdir}
-install -pm 644 pom.xml \
-    %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -134,21 +157,27 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(0644,root,root,0755)
-%doc changelog.txt
+%doc changelog.txt LICENSE.txt
 %{_javadir}/*
-%{_mavenpomdir}/*
-#{_mavendepmapfragdir}/*
 
 %files manual
 %defattr(0644,root,root,0755)
-%doc manual.html
+%doc manual.html LICENSE.txt
 
 %files javadoc
 %defattr(0644,root,root,0755)
-%doc %{_javadocdir}/%{name}-%{version}
-%doc %{_javadocdir}/%{name}
+%doc LICENSE.txt
+%{_javadocdir}/%{name}
 
 %changelog
+* Sat Jan 24 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 0.11a-7
+- rebuilt on current VineSeed
+- added Patch1 and Patch2
+
+* Sat Jun  2 2012 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 0.11a-6
+- rebuilt with rpm-4.8.1-3
+- updated URL
+
 * Sat Sep  4 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 0.11a-5
 - Initial build for Vine Linux
 

+ 51 - 48
r/rhino/rhino-vl.spec

@@ -7,7 +7,7 @@
 #
 # 1. Redistributions of source code must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
+# 2. Redistribution1s in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the
 #    distribution.
@@ -28,29 +28,36 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
-%define cvs_version 1_7R2
+%define scm_version 1_7R4
 
 Name:           rhino
-Summary:        JavaScript for Java
 Version:        1.7
-Release:        0.r2.1%{?_dist_release}
+Release:        0.r4.1%{?_dist_release}
+Summary:        JavaScript for Java
+Summary(ja):    Java で記述された JavaScript
 
 Group:          Development/Libraries
-License:        MPLv1.1 or GPLv2+
+License:        MPLv2.0
 URL:            http://www.mozilla.org/rhino/
 
-Source0:        ftp://ftp.mozilla.org/pub/mozilla.org/js/rhino%{cvs_version}.zip
+Source0:        https://github.com/mozilla/rhino/archive/Rhino%{scm_version}_RELEASE.zip
 Source2:        %{name}.script
 
-#Patch0:         %{name}-build.patch
-## Patch to try several methods of loading jline library or fail gracefully
-#Patch1:         %{name}-457336.diff
+Patch0:         %{name}-build.patch
+# Add OSGi metadata from Eclipse Orbit project
+# Rip out of MANIFEST.MF included in this JAR:
+# http://www.eclipse.org/downloads/download.php?r=1&file=/tools/orbit/downloads/drops/R20110523182458/repository/plugins/org.mozilla.javascript_1.7.2.v201005080400.jar
+Patch1:         %{name}-addOrbitManifest.patch
+Patch2:         %{name}-shell-manpage.patch
+# Originally from https://github.com/mozilla/rhino/commit\
+#    /52e25f784cd1b927d44383aa9afb358191df97e4.patch
+# See RHBZ# 1011947
+Patch3:         %{name}-overflow-detection.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 BuildArch:      noarch
-#BuildRequires:  ant
-#BuildRequires:  bea-stax-api
-#BuildRequires:  java-1.6.0-openjdk-devel >= 1:1.6.0.0
+BuildRequires:  ant
+BuildRequires:  java-devel
 Requires:       jpackage-utils
 Requires:       jline
 
@@ -71,6 +78,7 @@ Rhino はすべてが Java で記述された JavaScript のオープンソー
 
 %package        demo
 Summary:        Examples for %{name}
+Summary(ja):    %{name} のデモプログラム
 Group:          Development/Libraries
 
 %description    demo
@@ -83,54 +91,44 @@ Examples for %{name}.
 #%description    manual
 #Documentation for %{name}.
 
-#%package        javadoc
-#Summary:        Javadoc for %{name}
-#Group:          Development/Documentation
-#
-#%description    javadoc
-#Javadoc for %{name}.
-
 %prep
-%setup -q -n %{name}%{cvs_version}
-#patch0 -p1
-#patch1 -p0 -b .jline
+%setup -q -n %{name}-Rhino%{scm_version}_RELEASE
+%patch0 -p1 -b .build
+%patch1 -p1 -b .fixManifest
+%patch2 -p1 -b .manpage
+%patch3 -p1 -b .overflow
 
 # Fix build
-#{__perl} -pi -e 's|.*<get.*src=.*>\n||' build.xml testsrc/build.xml toolsrc/org/mozilla/javascript/tools/debugger/build.xml xmlimplsrc/build.xml
+sed -i -e '/.*<get.*src=.*>$/d' build.xml testsrc/build.xml \
+       toolsrc/org/mozilla/javascript/tools/debugger/build.xml xmlimplsrc/build.xml
 
 # Fix manifest
-#{__perl} -pi -e 's|^Class-Path:.*\n||g' src/manifest
+sed -i -e '/^Class-Path:.*$/d' src/manifest
 
 # Add jpp release info to version
-#{__perl} -pi -e 's|^implementation.version: Rhino .* release .* \${implementation.date}|implementation.version: Rhino %{version} release %{release} \${implementation.date}|' build.properties
+sed -i -e 's|^implementation.version: Rhino .* release .* \${implementation.date}|implementation.version: Rhino %{version} release %{release} \${implementation.date}|' build.properties
 
 %build
-#export CLASSPATH=
-#export OPT_JAR_LIST=:
-#ant -Dxbean.jar=$(build-classpath xmlbeans/xbean) \
-#    -Djsr173.jar=$(build-classpath bea-stax-api) deepclean jar copy-all javadoc
+ant deepclean jar copy-all -Dno-xmlbeans=1
 
-#pushd examples
-#export CLASSPATH=../build/%{name}%{cvs_version}/js.jar:$(build-classpath xmlbeans/xbean 2>/dev/null)
-#{javac} *.java
-#{jar} cvf ../build/%{name}%{cvs_version}/%{name}-examples-%{version}.jar *.class
-#popd
+pushd examples
+export CLASSPATH=../build/%{name}%{scm_version}/js.jar:$(build-classpath xmlbeans/xbean 2>/dev/null)
+%{javac} *.java
+%{jar} cvf ../build/%{name}%{scm_version}/%{name}-examples.jar *.class
+popd
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 # jars
 mkdir -p $RPM_BUILD_ROOT%{_javadir}
-install -m 644 js.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
-#%{__cp} -a build/%{name}%{cvs_version}/%{name}-examples-%{version}.jar %{buildroot}%{_javadir}/%{name}-examples-%{version}.jar
-#(cd %{buildroot}%{_javadir} && %{__ln_s} %{name}-%{version}.jar js-%{version}.jar)
-(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do %{__ln_s} ${jar} `echo $jar| %{__sed} "s|-%{version}||g"`; done)
+cp -a build/%{name}%{scm_version}/js.jar $RPM_BUILD_ROOT%{_javadir}
+ln -s js.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
+cp -a build/%{name}%{scm_version}/%{name}-examples.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-examples.jar
 
-# javadoc
-#%{__mkdir_p} %{buildroot}%{_javadocdir}/%{name}-%{version}
-#%{__cp} -a build/%{name}%{cvs_version}/javadoc/* %{buildroot}%{_javadocdir}/%{name}-%{version}
-#%{__ln_s} %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
-#%{_bindir}/find %{buildroot}%{_javadocdir}/%{name}-%{version} -type f -name '*.html' | %{_bindir}/xargs %{__perl} -pi -e 's/\r$//g'
+# man page
+mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1/
+install -m 644 build/%{name}%{scm_version}/man/%{name}.1 $RPM_BUILD_ROOT%{_mandir}/man1/%{name}.1
 
 ## script
 mkdir -p $RPM_BUILD_ROOT%{_bindir}
@@ -139,6 +137,8 @@ install -m 755 %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}/%{name}
 # examples
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}
 cp -a examples/* $RPM_BUILD_ROOT%{_datadir}/%{name}
+find $RPM_BUILD_ROOT%{_datadir}/%{name} -name '*.build' -delete
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -148,6 +148,7 @@ rm -rf $RPM_BUILD_ROOT
 %doc LICENSE.txt
 %attr(0755,root,root) %{_bindir}/*
 %{_javadir}/*
+%{_mandir}/man1/%{name}.1*
 
 %files demo
 %defattr(0644,root,root,0755)
@@ -156,14 +157,16 @@ rm -rf $RPM_BUILD_ROOT
 #%files manual
 #%defattr(0644,root,root,0755)
 #%if 0
-#%doc build/%{name}%{cvs_version}/docs/*
+#%doc build/%{name}%{scm_version}/docs/*
 #%endif
 
-#files javadoc
-#defattr(0644,root,root,0755)
-#doc %{_javadocdir}/*
-
 %changelog
+* Fri Jan 23 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> - 1.7-0.r4.1
+- new upstream release
+
+* Sat Jun  2 2012 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 1.7-0.r3.1
+- new upstream release
+
 * Wed Sep  1 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 1.7-0.r2.1
 - Initial build for VineLinux
 

+ 51 - 61
x/xerces-c/xerces-c-vl.spec

@@ -1,23 +1,30 @@
 Summary:	Validating XML Parser
 Name:		xerces-c
-Version:	2.8.0
-Release: 2%{?_dist_release}
+Version:	3.1.1
+Release:	1%{?_dist_release}
 License:	ASL 2.0
 Group:		System Environment/Libraries
 URL:		http://xml.apache.org/xerces-c/
-Source:		http://www.apache.org/dist/xerces/c/sources/xerces-c-src_2_8_0.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+
+Source0:	http://www.apache.org/dist/xerces/c/3/sources/xerces-c-%{version}.tar.gz
+
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
+BuildRequires:	dos2unix
 
 %description
 Xerces-C is a validating XML parser written in a portable subset of
 C++. Xerces-C makes it easy to give your application the ability to
 read and write XML data. A shared library is provided for parsing,
 generating, manipulating, and validating XML documents. Xerces-C is
-faithful to the XML 1.0 recommendation and associated standards ( DOM
-1.0, DOM 2.0. SAX 1.0, SAX 2.0, Namespaces).
+faithful to the XML 1.0 recommendation and associated standards:
+XML 1.0 (Third Edition), XML 1.1 (First Edition), DOM Level 1, 2, 3
+Core, DOM Level 2.0 Traversal and Range, DOM Level 3.0 Load and Save,
+SAX 1.0 and SAX 2.0, Namespaces in XML, Namespaces in XML 1.1, XML
+Schema, XML Inclusions).
 
 %package	devel
 Summary:	Header files, libraries and development documentation for %{name}
+Summary(ja):	%{name} のヘッダファイル、ライブラリ、開発用ドキュメント
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
 
@@ -27,8 +34,9 @@ documentation for %{name}. If you like to develop programs using %{name},
 you will need to install %{name}-devel.
 
 %package doc
-Group:		Documentation
 Summary:	Documentation for Xerces-C++ validating XML parser
+Group:		Documentation
+BuildArch:	noarch
 
 %description doc
 Documentation for Xerces-C++.
@@ -39,82 +47,64 @@ write XML data. A shared library is provided for parsing, generating,
 manipulating, and validating XML documents.
 
 %prep
-%setup -q -n xerces-c-src_2_8_0
-rm -rf doc/html/resources/.svn
-find ./doc -type f -perm 755 -exec chmod 644 {} \;
-find ./samples -type f -perm 755 -exec chmod 644 {} \;
-%{__perl} -pi.orig -e 's|(PREFIX.)/lib\b|$1/%{_lib}|g' src/xercesc/configure */Makefile.in
-rm doc/html/apiDocs/XMLRegisterCleanup_8hpp__incl.map
-rm doc/html/apiDocs/XSConstants_8hpp__incl.map
-
-# make rpmlint happy
-sed -i 's/\r//' doc/charter.xml
-iconv -f iso8859-1 -t utf-8 credits.txt > credits.utf8 && mv -f credits.{utf8,txt}
-iconv -f iso8859-1 -t utf-8 doc/feedback.xml > doc/feedback.utf8 && mv -f doc/feedback.{utf8,xml}
-iconv -f iso8859-1 -t utf-8 doc/migration.xml > doc/migration.utf8 && mv -f doc/migration.{utf8,xml}
-iconv -f iso8859-1 -t utf-8 doc/releases_archive.xml > doc/releases_archive.utf8 && mv -f doc/releases_archive.{utf8,xml}
+%setup -q 
+# Copy samples before build to avoid including built binaries in -doc package
+mkdir -p _docs
+cp -a samples/ _docs/
 
 %build
-export XERCESCROOT="$PWD"
-
-# Let Makefiles be verbose
-find -name 'Makefile.*' | while read f; do
-	sed -i -e 's/$Q//g' \
-	-e 's/{MAKE} -s/(MAKE)/g' \
-	-e '/echo \"  (/d' \
-	$f
-done
-
-# Remove conflicting flags from runConfigure
-find -name runConfigure | while read f; do
-	sed -i -e 's/-w -O -DNDEBUG/-DNDEBUG/g' $f
-done
-
-cd $XERCESCROOT/src/xercesc
-%ifarch alpha ppc64 s390x sparc64 x86_64
-CXXFLAGS="${RPM_OPT_FLAGS}" CFLAGS="${RPM_OPT_FLAGS}" ./runConfigure -plinux -cgcc -xg++ -minmem -nsocket -tnative -rpthreads -b64 -P %{_prefix} -C --libdir="%{_libdir}"
-%else
-CXXFLAGS="${RPM_OPT_FLAGS}" CFLAGS="${RPM_OPT_FLAGS}" ./runConfigure -plinux -cgcc -xg++ -minmem -nsocket -tnative -rpthreads -b32 -P %{_prefix} -C --libdir="%{_libdir}"
-%endif
-# not smp safe
-%{__make}
-#cd $XERCESCROOT/samples
-#CXXFLAGS="${RPM_OPT_FLAGS}" CFLAGS="${RPM_OPT_FLAGS}" ./runConfigure -plinux -cgcc -xg++
-#%{__make}
+# --disable-sse2 makes sure explicit -msse2 isn't passed to gcc so
+# the binaries would be compatible with non-SSE2 i686 hardware.
+# This only affects i686, as on x86_64 the compiler uses SSE2 by default.
+export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
+export CXXFLAGS="$CFLAGS"
+%configure --disable-static \
+  --disable-pretty-make \
+  --disable-sse2
+make %{?_smp_mflags}
 
 %install
-%{__rm} -rf $RPM_BUILD_ROOT
-export XERCESCROOT="$PWD"
-%{__make} install -C src/xercesc DESTDIR="$RPM_BUILD_ROOT"
-#mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}
-#rm -rf $XERCESCROOT/samples/Projects
-#cp -a $XERCESCROOT/samples $RPM_BUILD_ROOT%{_datadir}/%{name}
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR="$RPM_BUILD_ROOT"
+# Correct errors in encoding
+iconv -f iso8859-1 -t utf-8 CREDITS > CREDITS.tmp && mv -f CREDITS.tmp CREDITS
+# Correct errors in line endings
+pushd doc; dos2unix -k *.xml; popd
+# Remove unwanted binaries
+rm -rf $RPM_BUILD_ROOT%{_bindir}
+# Remove .la files
+rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 
 %post -p /sbin/ldconfig
+
 %postun -p /sbin/ldconfig
 
 %clean
-%{__rm} -rf $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc LICENSE.txt
-%{_libdir}/libxerces*.so.*
+%doc LICENSE
+%{_libdir}/libxerces-c-3.*.so
 
 %files devel
 %defattr(-,root,root,-)
-%{_libdir}/libxerces*.so
+%{_libdir}/libxerces-c.so
+%{_libdir}/pkgconfig/xerces-c.pc
 %{_includedir}/xercesc/
 
 %files doc
 %defattr(-,root,root,-)
-%doc Readme.html LICENSE NOTICE STATUS credits.txt doc samples
+%doc README LICENSE NOTICE CREDITS doc _docs/*
 
-#%files samples
-#%defattr(-,root,root,-)
-#%{_datadir}/%{name}/samples
 
 %changelog
+* Sat Jan 24 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 3.1.1-1
+- updated to 3.1.1
+
+* Sat Feb 04 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.8.0-3
+- rebuild with Vine6 environment
+
 * Tue Mar 02 2010 Shu KONNO <owa@bg.wakwak.com> 2.8.0-2
 - rebuilt with new toolchain
 

+ 79 - 67
x/xml-commons-apis/xml-commons-apis-vl.spec

@@ -1,59 +1,35 @@
-# Copyright (c) 2000-2007, JPackage Project
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the
-#    distribution.
-# 3. Neither the name of the JPackage Project nor the names of its
-#    contributors may be used to endorse or promote products derived
-#    from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-
 Name:           xml-commons-apis
-Summary:        APIs for DOM, SAX, and JAXP
-Version:        1.3.04
+Version:        1.4.01
 Release:        1%{?_dist_release}
+Summary:        APIs for DOM, SAX, and JAXP
+Summary(ja):    DOX, SAX, JAXP 用 API
 
-#Group:          Text Processing/Markup/XML
-Group:          System Environment/Libraries
+Group:          Development/Libraries
 License:        ASL 2.0 and W3C and Public Domain
 URL:            http://xml.apache.org/commons/
 
-
-# using binary package for bootstrap
-Source0:        xml-commons-external-%{version}-bin.tar.gz
-# svn export http://svn.apache.org/repos/asf/xml/commons/tags/xml-commons-external-1_4_01/java/external/
-# tar czf xml-commons-external-1.4.01-src.tar.gz external
+# From source control because the published tarball doesn't include some docs:
+#   svn export http://svn.apache.org/repos/asf/xml/commons/tags/xml-commons-external-1_4_01/java/external/
+#   tar czf xml-commons-external-1.4.01-src.tar.gz external
+Source0:       xml-commons-external-%{version}-src.tar.gz
+Source1:       %{name}-MANIFEST.MF
+Source2:       %{name}-ext-MANIFEST.MF
+Source3:       http://repo1.maven.org/maven2/xml-apis/xml-apis/2.0.2/xml-apis-2.0.2.pom
+Source4:       http://repo1.maven.org/maven2/xml-apis/xml-apis-ext/1.3.04/xml-apis-ext-1.3.04.pom
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 BuildArch:      noarch
-BuildRequires:  jpackage-utils >= 1.5
-#BuildRequires:  ant
-Requires:       jpackage-utils >= 1.5
-
-Obsoletes:      xml-commons <= 1.3.02
+BuildRequires:  java-devel
+BuildRequires:  jpackage-utils
+BuildRequires:  ant
+BuildRequires:  zip
+Requires:       java-headless
+Requires:       jpackage-utils
+
+Obsoletes:      xml-commons < %{version}-%{release}
 Provides:       xml-commons = %{version}-%{release}
 
-Provides:       jaxp = 1.3
+# TODO: Ugh, this next line should be dropped since it actually provides JAXP 1.4 now...
 Provides:       xml-commons-jaxp-1.3-apis = %{version}-%{release}
 
 %description
@@ -63,66 +39,102 @@ includes the DOM, SAX, and JAXP.
 
 %package manual
 Summary: Manual for %{name}
-Group: Applications/Documentation
+Summary(ja): %{name} のマニュアル
+Group: Documentation
 
 %description manual
 Manual for %{name}.
 
+%package javadoc
+Summary: Javadoc for %{name}
+Summary(ja): %{name} の Javadoc
+Group: Documentation
+
+%description javadoc
+%{summary}.
+
 # -----------------------------------------------------------------------------
 
 %prep
-%setup -q -n xml-commons-external-%{version}
+%setup -q -n external
+# 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 '{}' \;
 
-# -----------------------------------------------------------------------------
+# Fix file encodings
+iconv -f iso8859-1 -t utf-8 LICENSE.dom-documentation.txt > \
+  LICENSE.dom-doc.temp && mv -f LICENSE.dom-doc.temp LICENSE.dom-documentation.txt
+iconv -f iso8859-1 -t utf-8 LICENSE.dom-software.txt > \
+  LICENSE.dom-sof.temp && mv -f LICENSE.dom-sof.temp LICENSE.dom-software.txt
+
+# remove bogus section from poms
+cp %{SOURCE3} %{SOURCE4} .
+sed -i '/distributionManagement/,/\/distributionManagement/ {d}' *.pom
 
 %build
+ant -Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5 jar javadoc
 
-# -----------------------------------------------------------------------------
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
+mkdir -p META-INF
+cp -p %{SOURCE1} META-INF/MANIFEST.MF
+touch META-INF/MANIFEST.MF
+zip -u build/xml-apis.jar META-INF/MANIFEST.MF
+cp -p %{SOURCE2} META-INF/MANIFEST.MF
+touch META-INF/MANIFEST.MF
+zip -u build/xml-apis-ext.jar META-INF/MANIFEST.MF
+
 # Jars
-mkdir -p $RPM_BUILD_ROOT%{_javadir}
-cp -p xml-apis.jar \
-  $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
-cp -p xml-apis-ext.jar \
-  $RPM_BUILD_ROOT%{_javadir}/%{name}-ext-%{version}.jar
-
-# Jar versioning
-(cd $RPM_BUILD_ROOT%{_javadir} && for jar in %{name}-%{version}.jar; do ln -sf ${jar} dom3-${jar}; done)
-(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/xml-apis.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
+#install -pDm 644 xml-apis-[0-9]*.pom $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{name}.po
+#add_maven_depmap -a xerces:dom3-xml-apis
+
+install -pD -T build/xml-apis-ext.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-ext.jar
+#install -pDm 644 xml-apis-ext*.pom $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{name}-ext.pom
+#add_maven_depmap JPP-%{name}-ext.pom %{name}-ext.jar
+
 # for better interoperability with the jpp apis packages
 ln -sf %{name}.jar $RPM_BUILD_ROOT%{_javadir}/jaxp13.jar
 ln -sf %{name}.jar $RPM_BUILD_ROOT%{_javadir}/jaxp.jar
 ln -sf %{name}.jar $RPM_BUILD_ROOT%{_javadir}/xml-commons-jaxp-1.3-apis.jar
 
-# -----------------------------------------------------------------------------
+# Javadocs
+mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+cp -pr build/docs/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+
+# prevent apis javadoc from being included in doc
+rm -rf build/docs/javadoc
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-# -----------------------------------------------------------------------------
 
 %files
 %defattr(-,root,root,-)
 %doc LICENSE NOTICE 
 %doc LICENSE.dom-documentation.txt README.dom.txt
-%doc LICENSE.dom-software.txt
-%doc LICENSE.sax.txt README.sax.txt
+%doc LICENSE.dom-software.txt LICENSE.sac.html
+%doc LICENSE.sax.txt README-sax  README.sax.txt
 %{_javadir}/*
 
 %files manual
 %defattr(-,root,root,-)
-%doc docs/*
+%doc build/docs/*
 
-#files javadoc
-#defattr(-,root,root,-)
-#{_javadocdir}/*
+%files javadoc
+%defattr(-,root,root,-)
+%{_javadocdir}/*
 
-# -----------------------------------------------------------------------------
 
 %changelog
+* Fri Jan 23 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 1.4.01-1
+- updated to 1.4.01
+
+* Sat Feb 04 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.3.04-2
+- rebuild with Vine6 environment
+
 * Fri Aug 27 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 1.3.04-1
 - Initial build for Vine Linux
 - used version 1.3.04

+ 44 - 30
x/xmlcopyeditor/xmlcopyeditor-vl.spec

@@ -1,67 +1,81 @@
-%define _ver 1.2.0.6
-%define _rel 2
 Summary: Fast, free, validating XML editor
-Summary(ja): 高速な XM L検証エディタ
+Summary(ja): 高速な XML 検証エディタ
 Name: xmlcopyeditor
-Version: %{_ver}.%{_rel}
-Release: 2%{?_dist_release}
-License: GPL
-URL: http://xml-copy-editor.sourceforge.net/
-Source0: xmlcopyeditor-%{_ver}-%{_rel}.tar.gz
+Version: 1.2.1.3
+Release: 1%{?_dist_release}
+
+License: GPLv2
 Group: Applications/Editors
+URL: http://xml-copy-editor.sourceforge.net/
+
+Source0: xmlcopyeditor-%{version}.tar.gz
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: pcre-devel
 BuildRequires: aspell-devel
-BuildRequires: libboost libboost-devel
-BuildRequires: xerces-c xerces-c-devel
-BuildRequires: libxml-devel
-BuildRequires: libxslt-devel
+BuildRequires: desktop-file-utils
+BuildRequires: enchant-devel
 BuildRequires: expat-devel
+BuildRequires: libboost-devel
+BuildRequires: libxml2-devel
+BuildRequires: libxslt-devel
+BuildRequires: pcre-devel
+BuildRequires: xerces-c-devel
 BuildRequires: wxGTK-devel >= 2.8
+Requires(post): desktop-file-utils
+Requires(postun): desktop-file-utils
 
 %description
-XML Copy Editor is an XML editor focusing on editing document markup languages like
-DITA, DocBook, WordprocessingML. It features DTD/XML Schema/RELAX NG validation,
-XSLT, XPath, pretty-printing, syntax highlighting, folding, tag completion/locking,
-and a spelling/style check. 
+XML Copy Editor is an XML editor focusing on editing document markup languages like DITA, DocBook, WordprocessingML. It features DTD/XML Schema/RELAX NG validation, XSLT, XPath, pretty-printing, syntax highlighting, folding, tag completion/locking, and a spelling/style check. 
 
 
 %prep
-%setup -q -n xmlcopyeditor-%{_ver}
-
+%setup -q 
+find src -type f -print0 | xargs -0 chmod a-x
+tr -d '\r' < src/copying/gpl.txt > COPYING
+chmod a-x AUTHORS COPYING NEWS
 
 %build
-%configure \
-	CFLAGS="$CFLAGS -I/usr/include/pcre" \
-	CXXFLAGS="$CXXFLAGS -I/usr/include/pcre" \
-	CC="gcc -I/usr/include/pcre" \
-	CXX="g++ -I/usr/include/pcre" \
-	;
-%__make %{?_smp_mflags}
+%configure 
+make %{?_smp_mflags}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
+desktop-file-install \
+    --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+    --remove-key=Icon \
+    --set-key=Icon --set-value=xmlcopyeditor.png \
+    $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
+
+%find_lang %{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
-%{_bindir}/update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+update-desktop-database &> /dev/null || :
 
 %postun
-%{_bindir}/update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+update-desktop-database &> /dev/null || :
+
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root)
+%doc AUTHORS COPYING NEWS
 %{_bindir}/%{name}
-%config(missingok) %{_datadir}/applications/%{name}.desktop
+%{_datadir}/appdata/%{name}.appdata.xml
+%{_datadir}/applications/%{name}.desktop
 %{_datadir}/pixmaps/%{name}.png
 %{_datadir}/%{name}
+%{_mandir}/man1/*
 
 %changelog
+* Sat Jan 24 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> - 1.2.1.3-1
+- new upstream release
+- built with xerces-c 3.1.1
+
 * Wed Jul 11 2012 Toshiharu Kudoh <toshi.kd2@gmail.com> - 1.2.0.6.2-2
 - changed Buildrequires: wx-gtk2-devel >= 2.8 to wxGTK-devel >= 2.8