Update to latest upstream version 2013.5.1
- Clean up tarball - Fix BR/R
This commit is contained in:
Michal Srb
parent
51567104dc
commit
0955ef5b58
1
.gitignore
vendored
1
.gitignore
vendored
@ -3,3 +3,4 @@ msv-20050722.tar.gz
|
||||
/msv-2013.2.3.tar.gz
|
||||
/msv-parent-2009.1.pom
|
||||
/LICENSE-2.0.txt
|
||||
/msv-2013.5.1-clean.tar.gz
|
||||
|
||||
22
create-tarball.sh
Executable file
22
create-tarball.sh
Executable file
@ -0,0 +1,22 @@
|
||||
#!/bin/bash
|
||||
|
||||
if [ $# -ne 1 ]; then
|
||||
echo "Usage: ./create-tarball VERSION"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
VERSION=${1}
|
||||
NAME="msv"
|
||||
|
||||
# Generate tarball from upstream source control:
|
||||
svn co https://svn.java.net/svn/${NAME}~svn/tags/${NAME}-${VERSION}/ ${NAME}-${VERSION}
|
||||
|
||||
# Remove things that we don't need
|
||||
(
|
||||
cd ${NAME}-${VERSION}
|
||||
rm -Rf www/ relames/doc/ relames/schemas
|
||||
rm -Rf schmit/ shared/ tahiti/
|
||||
)
|
||||
|
||||
tar zcf ${NAME}-${VERSION}-clean.tar.gz ${NAME}-${VERSION}
|
||||
|
||||
55
msv.spec
55
msv.spec
@ -1,16 +1,15 @@
|
||||
Name: msv
|
||||
Epoch: 1
|
||||
Version: 2013.2.3
|
||||
Release: 3%{?dist}
|
||||
Version: 2013.5.1
|
||||
Release: 1%{?dist}
|
||||
Summary: Multi-Schema Validator
|
||||
Group: Development/Libraries
|
||||
License: BSD and ASL 1.1
|
||||
URL: http://msv.java.net/
|
||||
|
||||
# To generate tarball from upstream source control:
|
||||
# $ svn co https://svn.java.net/svn/msv~svn/tags/msv-2013.2.3/ msv-2013.2.3
|
||||
# $ tar zcf msv-2013.2.3.tar.gz msv-2013.2.3
|
||||
Source0: %{name}-%{version}.tar.gz
|
||||
# $ ./create-tarball
|
||||
Source0: %{name}-%{version}-clean.tar.gz
|
||||
|
||||
# Parent POM is no longer in svn, get it from Maven central repository
|
||||
Source1: http://repo1.maven.org/maven2/net/java/dev/%{name}/%{name}-parent/2009.1/%{name}-parent-2009.1.pom
|
||||
@ -46,6 +45,7 @@ BuildRequires: xerces-j2
|
||||
BuildRequires: junit
|
||||
BuildRequires: jvnet-parent
|
||||
BuildRequires: xml-commons-resolver
|
||||
BuildRequires: isorelax
|
||||
|
||||
BuildArch: noarch
|
||||
|
||||
@ -123,9 +123,6 @@ Requires: isorelax
|
||||
Requires: relaxngDatatype
|
||||
Requires: xerces-j2
|
||||
|
||||
# Can remove these obsoletes at Fedora 17 time
|
||||
Obsoletes: xsdlib < %{version}-%{release}
|
||||
|
||||
%description xsdlib
|
||||
%{summary}.
|
||||
|
||||
@ -138,13 +135,6 @@ Requires: jpackage-utils
|
||||
Requires: isorelax-javadoc
|
||||
Requires: relaxngDatatype-javadoc
|
||||
|
||||
# Can remove these obsoletes at Fedora 17 time
|
||||
Obsoletes: msv-msv-javadoc < %{version}-%{release}
|
||||
Obsoletes: msv-relames-javadoc < %{version}-%{release}
|
||||
Obsoletes: msv-xmlgen-javadoc < %{version}-%{release}
|
||||
Obsoletes: msv-xsdlib-javadoc < %{version}-%{release}
|
||||
Obsoletes: xsdlib-javadoc < %{version}-%{release}
|
||||
|
||||
%description javadoc
|
||||
%{summary}.
|
||||
|
||||
@ -198,6 +188,14 @@ done
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
|
||||
# Fix isorelax groupId
|
||||
%pom_xpath_replace "pom:dependency[pom:groupId[text()='com.sun.xml.bind.jaxb']]/pom:groupId" "<groupId>isorelax</groupId>"
|
||||
%pom_xpath_replace "pom:dependency[pom:groupId[text()='com.sun.xml.bind.jaxb']]/pom:groupId" "<groupId>isorelax</groupId>" generator
|
||||
%pom_xpath_replace "pom:dependency[pom:groupId[text()='com.sun.xml.bind.jaxb']]/pom:groupId" "<groupId>isorelax</groupId>" msv
|
||||
%pom_xpath_replace "pom:dependency[pom:groupId[text()='com.sun.xml.bind.jaxb']]/pom:groupId" "<groupId>isorelax</groupId>" relames
|
||||
%pom_xpath_replace "pom:dependency[pom:groupId[text()='com.sun.xml.bind.jaxb']]/pom:groupId" "<groupId>isorelax</groupId>" rngconverter
|
||||
%pom_xpath_replace "pom:dependency[pom:groupId[text()='com.sun.xml.bind.jaxb']]/pom:groupId" "<groupId>isorelax</groupId>" xsdlib
|
||||
|
||||
# Change encoding of non utf-8 files
|
||||
for m in $(find . -name copyright.txt) ; do
|
||||
iconv -f iso-8859-1 -t utf-8 < $m > $m.utf8
|
||||
@ -262,9 +260,6 @@ install -m 644 msv/doc/*.html %{buildroot}%{_docdir}/%{name}-%{version}/msv
|
||||
install -m 644 msv/doc/*.gif %{buildroot}%{_docdir}/%{name}-%{version}/msv
|
||||
install -m 644 msv/doc/README.txt %{buildroot}%{_docdir}/%{name}-%{version}/msv
|
||||
|
||||
install -d -m 755 %{buildroot}%{_docdir}/%{name}-%{version}/relames
|
||||
install -m 644 relames/doc/README.txt %{buildroot}%{_docdir}/%{name}-%{version}/relames
|
||||
|
||||
install -d -m 755 %{buildroot}%{_docdir}/%{name}-%{version}/rngconverter
|
||||
install -m 644 rngconverter/README.txt %{buildroot}%{_docdir}/%{name}-%{version}/rngconverter
|
||||
|
||||
@ -295,7 +290,7 @@ cp -pr xsdlib/examples/* %{buildroot}%{_datadir}/%{name}-%{version}/xsdlib
|
||||
%{_javadir}/%{name}-core.jar
|
||||
%{_javadir}/%{name}-msv.jar
|
||||
%{_javadir}/%{name}-testharness*
|
||||
%doc msv/doc/license.txt
|
||||
%doc License.txt
|
||||
%doc msv/doc/Apache-LICENSE-1.1.txt
|
||||
%doc Apache-LICENSE-2.0.txt
|
||||
|
||||
@ -303,32 +298,31 @@ cp -pr xsdlib/examples/* %{buildroot}%{_datadir}/%{name}-%{version}/xsdlib
|
||||
%{_bindir}/relames
|
||||
%{_mavenpomdir}/JPP-%{name}-relames.pom
|
||||
%{_javadir}/%{name}-relames.jar
|
||||
%doc relames/doc/copyright.txt
|
||||
%doc relames/doc/Apache-LICENSE-1.1.txt
|
||||
%doc relames/License.txt
|
||||
%doc msv/doc/Apache-LICENSE-1.1.txt
|
||||
%doc License.txt
|
||||
|
||||
%files rngconv
|
||||
%{_bindir}/rngconv
|
||||
%{_mavenpomdir}/JPP-%{name}-rngconverter.pom
|
||||
%{_javadir}/%{name}-rngconverter.jar
|
||||
%{_javadir}/%{name}-rngconv.jar
|
||||
%doc rngconverter/License.txt
|
||||
%doc rngconverter/Apache-LICENSE-1.1.txt
|
||||
%doc msv/doc/Apache-LICENSE-1.1.txt
|
||||
%doc License.txt
|
||||
|
||||
%files xmlgen
|
||||
%{_bindir}/xmlgen
|
||||
%{_mavenpomdir}/JPP-%{name}-generator.pom
|
||||
%{_javadir}/%{name}-generator.jar
|
||||
%{_javadir}/%{name}-xmlgen.jar
|
||||
%doc generator/License.txt
|
||||
%doc generator/Apache-LICENSE-1.1.txt
|
||||
%doc msv/doc/Apache-LICENSE-1.1.txt
|
||||
%doc License.txt
|
||||
|
||||
%files xsdlib
|
||||
%{_mavenpomdir}/JPP-xsdlib.pom
|
||||
%{_javadir}/xsdlib.jar
|
||||
%{_javadir}/%{name}-xsdlib.jar
|
||||
%doc xsdlib/License.txt
|
||||
%doc xsdlib/Apache-LICENSE-1.1.txt
|
||||
%doc msv/doc/Apache-LICENSE-1.1.txt
|
||||
%doc License.txt
|
||||
|
||||
# This subpackage wins the parent poms and the depmap because all the other
|
||||
# subpackages require this one
|
||||
@ -350,6 +344,11 @@ cp -pr xsdlib/examples/* %{buildroot}%{_datadir}/%{name}-%{version}/xsdlib
|
||||
%{_datadir}/%{name}-%{version}
|
||||
|
||||
%changelog
|
||||
* Fri Jun 07 2013 Michal Srb <msrb@redhat.com> - 1:2013.5.1-1
|
||||
- Update to latest upstream version 2013.5.1
|
||||
- Clean up tarball
|
||||
- Fix BR/R
|
||||
|
||||
* Fri Apr 12 2013 Michal Srb <msrb@redhat.com> - 1:2013.2.3-3
|
||||
- Fix license tags in javadoc, manual, demo subpackages
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user