rpms/jakarta-commons-validator/devel jakarta-commons-validator.spec, 1.21, 1.22 .cvsignore, 1.5, 1.6 sources, 1.5, 1.6
Alexander Kurtakov
akurtakov at fedoraproject.org
Sun Jan 10 17:12:56 UTC 2010
Author: akurtakov
Update of /cvs/pkgs/rpms/jakarta-commons-validator/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14904/devel
Modified Files:
jakarta-commons-validator.spec .cvsignore sources
Log Message:
- Update to upstream 1.3.1.
Index: jakarta-commons-validator.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jakarta-commons-validator/devel/jakarta-commons-validator.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- jakarta-commons-validator.spec 25 Jul 2009 03:52:14 -0000 1.21
+++ jakarta-commons-validator.spec 10 Jan 2010 17:12:55 -0000 1.22
@@ -28,10 +28,6 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
-%define _with_gcj_support 1
-
-%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
-
%define with_tests %{?_with_tests:1}%{!?_without_tests:0}
%define base_name validator
@@ -40,18 +36,13 @@
Summary: Jakarta Commons Validator
Name: jakarta-%{short_name}
-Version: 1.1.4
-Release: 8.4%{?dist}
+Version: 1.3.1
+Release: 1%{?dist}
Epoch: 0
License: ASL 2.0
-Group: Development/Libraries/Java
+Group: Development/Libraries
Source0: http://www.apache.org/dist/jakarta/commons/validator/source/commons-validator-%{version}-src.tar.gz
Source1: %{name}.catalog
-# FIXME DTDs are not in the source tarball anymore (conf directory missing)
-# Obtainable from:
-# http://svn.apache.org/repos/asf/jakarta/commons/proper/validator/tags/VALIDATOR_1_1_4/conf/
-Source2: commons-validator-%{version}-conf.tar.gz
-Patch1: jakarta-commons-validator-%{version}-build.patch
URL: http://jakarta.apache.org/commons/validator/
BuildRequires: jpackage-utils >= 0:1.5
BuildRequires: ant >= 1.6.2
@@ -68,18 +59,10 @@ Requires: jakarta-commons-digester
Requires: jakarta-commons-logging >= 0:1.0.2
Requires: oro >= 0:2.0.6
Requires: xml-commons-apis
-%if ! %{gcj_support}
BuildArch: noarch
-%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
-Provides: %{short_name}
-Obsoletes: %{short_name}
-
-%if %{gcj_support}
-BuildRequires: java-gcj-compat-devel
-Requires(post): java-gcj-compat
-Requires(postun): java-gcj-compat
-%endif
+Provides: %{short_name} = %{epoch}:%{version}
+Obsoletes: %{short_name} <= %{epoch}:%{version}
%description
A common issue when receiving data either electronically or from user
@@ -92,10 +75,7 @@ of validation rules.
%package javadoc
Summary: Javadoc for %{name}
-Group: Development/Documentation
-# for /bin/rm and /bin/ln
-Requires(post): coreutils
-Requires(postun): coreutils
+Group: Documentation
%description javadoc
Javadoc for %{name}.
@@ -103,16 +83,13 @@ Javadoc for %{name}.
# -----------------------------------------------------------------------------
%prep
-%setup -q -n %{short_name}-%{version}
+%setup -q -n %{short_name}-%{version}-src
# remove all binary libs
find . -name "*.jar" -exec rm -f {} \;
-tar xzvf %{SOURCE2}
cp -p %{SOURCE1} conf/share/catalog
-%patch1
-
# -----------------------------------------------------------------------------
%build
@@ -121,10 +98,10 @@ xml-commons-apis oro junit jakarta-commo
jakarta-commons-beanutils jakarta-commons-collections)
%if %{with_tests}
-ant -Dbuild.sysclasspath=first test
+ant -Dskip.download=true -Dbuild.sysclasspath=first test
%endif
-ant -Dbuild.sysclasspath=first dist
+ant -Dskip.download=true -Dbuild.sysclasspath=first dist
# -----------------------------------------------------------------------------
@@ -133,7 +110,7 @@ rm -rf $RPM_BUILD_ROOT
# jars
mkdir -p $RPM_BUILD_ROOT%{_javadir}
-cp -p dist/%{short_name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
+cp -p dist/%{short_name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed "s|jakarta-||g"`; done)
(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
@@ -143,14 +120,11 @@ cp -p conf/share/{*.dtd,catalog} $RPM_BU
# javadoc
mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -pr dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+cp -pr dist/docs/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
# -----------------------------------------------------------------------------
-%if %{gcj_support}
-%{_bindir}/aot-compile-rpm
-%endif
-
%clean
rm -rf $RPM_BUILD_ROOT
@@ -164,13 +138,6 @@ if [ -x %{_bindir}/install-catalog -a -d
%{_datadir}/sgml/%{name}/catalog > /dev/null || :
fi
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
- %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
%postun
# Note that we're using versioned catalog, so this is always ok.
if [ -x %{_bindir}/install-catalog -a -d %{_sysconfdir}/sgml ]; then
@@ -179,41 +146,23 @@ if [ -x %{_bindir}/install-catalog -a -d
%{_datadir}/sgml/%{name}/catalog > /dev/null || :
fi
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
- %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%post javadoc
-rm -f %{_javadocdir}/%{name}
-ln -s %{name}-%{version} %{_javadocdir}/%{name}
-
-%postun javadoc
-if [ "$1" = "0" ]; then
- rm -f %{_javadocdir}/%{name}
-fi
-
-# -----------------------------------------------------------------------------
-
%files
-%defattr(0644,root,root,0755)
+%defattr(-,root,root,-)
%doc LICENSE.txt NOTICE.txt
%{_javadir}/*
%{_datadir}/sgml/%{name}
-%if %{gcj_support}
-%attr(-,root,root) %{_libdir}/gcj/%{name}
-%endif
-
%files javadoc
-%defattr(0644,root,root,0755)
+%defattr(-,root,root,-)
%{_javadocdir}/%{name}-%{version}
+%{_javadocdir}/%{name}
# -----------------------------------------------------------------------------
%changelog
+* Sun Jan 10 2010 Alexander Kurtakov <akurtako at redhat.com> 0:1.3.1-1
+- Update to upstream 1.3.1.
+
* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:1.1.4-8.4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/jakarta-commons-validator/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore 22 Feb 2006 04:03:51 -0000 1.5
+++ .cvsignore 10 Jan 2010 17:12:55 -0000 1.6
@@ -1,2 +1,3 @@
commons-validator-1.1.4-conf.tar.gz
commons-validator-1.1.4-src.tar.gz
+commons-validator-1.3.1-src.tar.gz
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/jakarta-commons-validator/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources 22 Feb 2006 04:03:51 -0000 1.5
+++ sources 10 Jan 2010 17:12:55 -0000 1.6
@@ -1,2 +1,2 @@
2c738bfbd840eeda89e2c911bea7a8ad commons-validator-1.1.4-conf.tar.gz
-6a4ef07da77dd86223e80870999448e8 commons-validator-1.1.4-src.tar.gz
+ac5b8d6f67982859fe77225ab7fe6548 commons-validator-1.3.1-src.tar.gz
More information about the scm-commits
mailing list