- Drop gcj_support.
- Fix groups and url. - Use upstream tarball.
This commit is contained in:
Alexander Kurtakov
parent
43e5b11b7a
commit
063989aeeb
@ -2,3 +2,4 @@ velocity-1.4-RHCLEAN.tar.bz2
|
||||
velocity-1.4
|
||||
noarch
|
||||
*.src.rpm
|
||||
velocity-1.4.tar.gz
|
||||
|
||||
1
sources
1
sources
@ -1 +1,2 @@
|
||||
61f3efdd490b01206b3c3377a86e4005 velocity-1.4-RHCLEAN.tar.bz2
|
||||
f280fee7ddb5eac5b354f6dea39a2f51 velocity-1.4.tar.gz
|
||||
|
||||
110
velocity.spec
110
velocity.spec
@ -28,20 +28,16 @@
|
||||
# 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 section free
|
||||
|
||||
|
||||
Name: velocity
|
||||
Version: 1.4
|
||||
Release: 10.4%{?dist}
|
||||
Release: 10.5%{?dist}
|
||||
Epoch: 0
|
||||
Summary: Java-based template engine
|
||||
License: ASL 2.0
|
||||
Source: velocity-1.4-RHCLEAN.tar.bz2
|
||||
Source: http://archive.apache.org/dist/velocity/engine/1.4/velocity-1.4.tar.gz
|
||||
Patch0: velocity-AnakiaJDOMFactory-jdom-DefaultJDOMFactory.patch
|
||||
Patch1: velocity-AnakiaTask-jdom-XMLOutputter.patch
|
||||
Patch2: velocity-servletapi5.patch
|
||||
@ -51,19 +47,19 @@ Patch3: velocity-build-testcases.patch
|
||||
# Renames all "enum" variables to "enumer" because "enum" is a reserved word in java >= 1.5
|
||||
# Not upstreamed, package outdated.
|
||||
Patch4: velocity-enum.patch
|
||||
URL: http://jakarta.apache.org/velocity/
|
||||
Group: Development/Libraries/Java
|
||||
URL: http://velocity.apache.org/
|
||||
Group: Development/Libraries
|
||||
Requires: jakarta-commons-collections
|
||||
# Use servletapi5 instead of servletapi3
|
||||
Requires: servletapi5
|
||||
Requires: oro
|
||||
Requires: werken.xpath
|
||||
Requires: werken-xpath
|
||||
Requires: jdom >= 0:1.0-1
|
||||
Requires: bcel
|
||||
Requires: log4j >= 0:1.1
|
||||
#FIXME replace with excalibur-avalon-logkit when available
|
||||
Requires: avalon-logkit
|
||||
BuildRequires: werken.xpath
|
||||
BuildRequires: werken-xpath
|
||||
BuildRequires: ant
|
||||
BuildRequires: antlr
|
||||
BuildRequires: junit
|
||||
@ -77,17 +73,9 @@ BuildRequires: log4j >= 0:1.1
|
||||
#FIXME replace with excalibur-avalon-logkit when available
|
||||
BuildRequires: avalon-logkit
|
||||
BuildRequires: jpackage-utils >= 0:1.6
|
||||
%if ! %{gcj_support}
|
||||
BuildArch: noarch
|
||||
%endif
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
|
||||
|
||||
%if %{gcj_support}
|
||||
BuildRequires: java-gcj-compat-devel
|
||||
Requires(post): java-gcj-compat
|
||||
Requires(postun): java-gcj-compat
|
||||
%endif
|
||||
|
||||
%description
|
||||
Velocity is a Java-based template engine. It permits anyone to use the
|
||||
simple yet powerful template language to reference objects defined in
|
||||
@ -111,32 +99,23 @@ applications to be developed according to a true MVC model.
|
||||
|
||||
%package manual
|
||||
Summary: Manual for %{name}
|
||||
Group: Development/Libraries/Java
|
||||
Group: Documentation
|
||||
|
||||
%description manual
|
||||
Documentation for %{name}.
|
||||
|
||||
%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}.
|
||||
|
||||
%package demo
|
||||
Summary: Demo for %{name}
|
||||
Group: Development/Libraries/Java
|
||||
Group: Development/Libraries
|
||||
Requires: %{name} = %{epoch}:%{version}-%{release}
|
||||
|
||||
%if %{gcj_support}
|
||||
BuildRequires: java-gcj-compat-devel
|
||||
Requires(post): java-gcj-compat
|
||||
Requires(postun): java-gcj-compat
|
||||
%endif
|
||||
|
||||
%description demo
|
||||
Demonstrations and samples for %{name}.
|
||||
|
||||
@ -198,68 +177,16 @@ cp -pr convert examples test $RPM_BUILD_ROOT%{_datadir}/%{name}
|
||||
|
||||
# -----------------------------------------------------------------------------
|
||||
|
||||
%if %{gcj_support}
|
||||
%{_bindir}/aot-compile-rpm
|
||||
%endif
|
||||
|
||||
%clean
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
# -----------------------------------------------------------------------------
|
||||
|
||||
%post javadoc
|
||||
rm -f %{_javadocdir}/%{name}
|
||||
ln -s %{name}-%{version} %{_javadocdir}/%{name}
|
||||
|
||||
%postun javadoc
|
||||
if [ "$1" = "0" ]; then
|
||||
rm -f %{_javadocdir}/%{name}
|
||||
fi
|
||||
|
||||
# -----------------------------------------------------------------------------
|
||||
|
||||
%post
|
||||
%if %{gcj_support}
|
||||
if [ -x %{_bindir}/rebuild-gcj-db ]
|
||||
then
|
||||
%{_bindir}/rebuild-gcj-db
|
||||
fi
|
||||
%endif
|
||||
|
||||
%postun
|
||||
%if %{gcj_support}
|
||||
if [ -x %{_bindir}/rebuild-gcj-db ]
|
||||
then
|
||||
%{_bindir}/rebuild-gcj-db
|
||||
fi
|
||||
%endif
|
||||
|
||||
%post demo
|
||||
%if %{gcj_support}
|
||||
if [ -x %{_bindir}/rebuild-gcj-db ]
|
||||
then
|
||||
%{_bindir}/rebuild-gcj-db
|
||||
fi
|
||||
%endif
|
||||
|
||||
%postun demo
|
||||
%if %{gcj_support}
|
||||
if [ -x %{_bindir}/rebuild-gcj-db ]
|
||||
then
|
||||
%{_bindir}/rebuild-gcj-db
|
||||
fi
|
||||
%endif
|
||||
|
||||
%files
|
||||
%defattr(0644,root,root,0755)
|
||||
%doc LICENSE NOTICE README.txt
|
||||
%{_javadir}/*.jar
|
||||
|
||||
%if %{gcj_support}
|
||||
%attr(-,root,root) %{_libdir}/gcj/%{name}/velocity-1.4.jar.*
|
||||
%attr(-,root,root) %{_libdir}/gcj/%{name}/classloader.*
|
||||
%endif
|
||||
|
||||
%files manual
|
||||
%defattr(0644,root,root,0755)
|
||||
%doc docs/*
|
||||
@ -272,21 +199,12 @@ fi
|
||||
%defattr(0644,root,root,0755)
|
||||
%{_datadir}/%{name}
|
||||
|
||||
# -----------------------------------------------------------------------------
|
||||
|
||||
#FIXME: Generated by spec-convert-gcj-* script. These cant be natively compiled
|
||||
#since they only contain *.vm files. Check if these are ignored in subsequent versions
|
||||
#of spec-convert-gcj-* script.
|
||||
#%if %{gcj_support}
|
||||
#%attr(-,root,root) %{_libdir}/gcj/%{name}/template.jar.*
|
||||
#%attr(-,root,root) %{_libdir}/gcj/%{name}/test1.jar.*
|
||||
#%attr(-,root,root) %{_libdir}/gcj/%{name}/test2.jar.*
|
||||
#%attr(-,root,root) %{_libdir}/gcj/%{name}/test1.jar.*
|
||||
#%attr(-,root,root) %{_libdir}/gcj/%{name}/test2.jar.*
|
||||
#%attr(-,root,root) %{_libdir}/gcj/%{name}/test.jar.*
|
||||
#%endif
|
||||
|
||||
%changelog
|
||||
* Sun Jan 10 2010 Alexander Kurtakov <akurtako@redhat.com> 0:1.4-10.5
|
||||
- Drop gcj_support.
|
||||
- Fix groups and url.
|
||||
- Use upstream tarball.
|
||||
|
||||
* Mon Aug 10 2009 Ville Skyttä <ville.skytta@iki.fi> - 0:1.4-10.4
|
||||
- Convert specfile to UTF-8.
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user