|
|
b59db5 |
|
|
|
b59db5 |
%global base_name el
|
|
|
b59db5 |
%global short_name commons-%{base_name}
|
|
|
b59db5 |
|
|
|
b59db5 |
|
|
|
b59db5 |
%{?scl:%scl_package apache-commons-el}
|
|
|
b59db5 |
%{!?scl:%global pkg_name %{name}}
|
|
|
8a0c48 |
%{?java_common_find_provides_and_requires}
|
|
|
b59db5 |
|
|
|
b59db5 |
Name: %{?scl_prefix}apache-%{short_name}
|
|
|
b59db5 |
Version: 1.0
|
|
|
8a0c48 |
Release: 31%{?dist}
|
|
|
b59db5 |
Summary: The Apache Commons Extension Language
|
|
|
b59db5 |
License: ASL 1.1
|
|
|
b59db5 |
URL: http://commons.apache.org/%{base_name}
|
|
|
b59db5 |
BuildArch: noarch
|
|
|
b59db5 |
Source0: http://archive.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz
|
|
|
b59db5 |
Source1: http://repo1.maven.org/maven2/%{short_name}/%{short_name}/%{version}/%{short_name}-%{version}.pom
|
|
|
b59db5 |
Patch0: %{short_name}-%{version}-license.patch
|
|
|
b59db5 |
Patch1: %{short_name}-eclipse-manifest.patch
|
|
|
b59db5 |
Patch2: %{short_name}-enum.patch
|
|
|
8a0c48 |
BuildRequires: %{?scl_prefix_java_common}ant
|
|
|
8a0c48 |
BuildRequires: %{?scl_prefix_java_common}tomcat-jsp-2.2-api
|
|
|
8a0c48 |
BuildRequires: %{?scl_prefix_java_common}tomcat-servlet-3.0-api
|
|
|
8a0c48 |
BuildRequires: %{?scl_prefix_java_common}junit
|
|
|
b59db5 |
|
|
|
b59db5 |
%description
|
|
|
b59db5 |
An implementation of standard interfaces and abstract classes for
|
|
|
b59db5 |
javax.servlet.jsp.el which is part of the JSP 2.0 specification.
|
|
|
b59db5 |
|
|
|
b59db5 |
%package javadoc
|
|
|
b59db5 |
Summary: API documentation for %{name}
|
|
|
b59db5 |
|
|
|
b59db5 |
|
|
|
b59db5 |
%description javadoc
|
|
|
b59db5 |
%{summary}.
|
|
|
b59db5 |
|
|
|
b59db5 |
|
|
|
b59db5 |
%prep
|
|
|
b59db5 |
%setup -q -n %{short_name}-%{version}-src
|
|
|
b59db5 |
%patch0 -p1 -b .license
|
|
|
b59db5 |
%patch1 -p1
|
|
|
b59db5 |
%patch2 -p1
|
|
|
b59db5 |
|
|
|
b59db5 |
# remove all precompiled stuff
|
|
|
b59db5 |
find . -type f -name "*.jar" -exec rm -f {} \;
|
|
|
b59db5 |
|
|
|
8a0c48 |
%{?scl:scl enable %{scl_maven} %{scl} - << "EOF"}
|
|
|
b59db5 |
cat > build.properties <
|
|
|
b59db5 |
build.compiler=modern
|
|
|
b59db5 |
junit.jar=$(build-classpath junit)
|
|
|
b59db5 |
servlet-api.jar=$(build-classpath tomcat-servlet-3.0-api)
|
|
|
b59db5 |
jsp-api.jar=$(build-classpath tomcat-jsp-2.2-api)
|
|
|
b59db5 |
servletapi.build.notrequired=true
|
|
|
b59db5 |
jspapi.build.notrequired=true
|
|
|
b59db5 |
EOBP
|
|
|
8a0c48 |
%{?scl:EOF}
|
|
|
b59db5 |
|
|
|
b59db5 |
# workaround for https://bugzilla.redhat.com/show_bug.cgi?id=1015612
|
|
|
b59db5 |
find . -iname 'ELParser.java' -exec sed -i 's:enum:enum1:g' \{\} \;
|
|
|
b59db5 |
|
|
|
b59db5 |
%build
|
|
|
8a0c48 |
%{?scl:scl enable %{scl_maven} %{scl} - << "EOF"}
|
|
|
b59db5 |
export CLASSPATH=
|
|
|
b59db5 |
export OPT_JAR_LIST=:
|
|
|
b59db5 |
%{ant} \
|
|
|
b59db5 |
-Dfinal.name=%{short_name} \
|
|
|
b59db5 |
-Dj2se.javadoc=%{_javadocdir}/java \
|
|
|
b59db5 |
jar javadoc
|
|
|
8a0c48 |
%{?scl:EOF}
|
|
|
b59db5 |
|
|
|
b59db5 |
%install
|
|
|
b59db5 |
rm -rf $RPM_BUILD_ROOT
|
|
|
b59db5 |
|
|
|
8a0c48 |
%{?scl:scl enable %{scl_maven} %{scl} - << "EOF"}
|
|
|
b59db5 |
# jars
|
|
|
b59db5 |
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
|
|
|
b59db5 |
install -p -m 644 dist/%{short_name}.jar $RPM_BUILD_ROOT%{_javadir}/%{pkg_name}-%{version}.jar
|
|
|
b59db5 |
pushd $RPM_BUILD_ROOT%{_javadir}
|
|
|
b59db5 |
for jar in *-%{version}*; do
|
|
|
b59db5 |
ln -sf ${jar} `echo $jar| sed "s|apache-||g"`
|
|
|
b59db5 |
ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`
|
|
|
b59db5 |
ln -sf ${jar} `echo $jar| sed "s|apache-\(.*\)-%{version}|\1|g"`
|
|
|
b59db5 |
done
|
|
|
b59db5 |
popd # come back from javadir
|
|
|
b59db5 |
|
|
|
b59db5 |
# pom
|
|
|
b59db5 |
install -pD -T -m 644 %{SOURCE1} %{buildroot}%{_mavenpomdir}/JPP-%{short_name}.pom
|
|
|
b59db5 |
%add_maven_depmap JPP-%{short_name}.pom %{short_name}.jar -a "org.apache.commons:commons-el"
|
|
|
b59db5 |
|
|
|
b59db5 |
# javadoc
|
|
|
b59db5 |
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{pkg_name}-%{version}
|
|
|
b59db5 |
cp -pr dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{pkg_name}-%{version}
|
|
|
b59db5 |
ln -s %{pkg_name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{pkg_name}
|
|
|
8a0c48 |
%{?scl:EOF}
|
|
|
b59db5 |
|
|
|
b59db5 |
|
|
|
b59db5 |
%clean
|
|
|
b59db5 |
rm -rf $RPM_BUILD_ROOT
|
|
|
b59db5 |
|
|
|
8a0c48 |
%files -f .mfiles
|
|
|
b59db5 |
%defattr(-,root,root,-)
|
|
|
b59db5 |
%doc LICENSE.txt STATUS.html
|
|
|
b59db5 |
%{_javadir}/%{pkg_name}-%{version}.jar
|
|
|
b59db5 |
%{_javadir}/%{pkg_name}.jar
|
|
|
b59db5 |
%{_javadir}/%{short_name}-%{version}.jar
|
|
|
b59db5 |
%{_javadir}/%{short_name}.jar
|
|
|
b59db5 |
|
|
|
b59db5 |
%files javadoc
|
|
|
b59db5 |
%defattr(-,root,root,-)
|
|
|
b59db5 |
%doc LICENSE.txt
|
|
|
b59db5 |
%{_javadocdir}/%{pkg_name}-%{version}
|
|
|
b59db5 |
%{_javadocdir}/%{pkg_name}
|
|
|
b59db5 |
|
|
|
b59db5 |
|
|
|
b59db5 |
%changelog
|
|
|
8a0c48 |
* Mon May 11 2015 Mat Booth <mat.booth@redhat.com> - 1.0-31
|
|
|
8a0c48 |
- Resolves: rhbz#1219013 - Fails to build from source
|
|
|
8a0c48 |
|
|
|
b59db5 |
* Fri Oct 10 2014 Mat Booth <mat.booth@redhat.com> - 1.0-30
|
|
|
b59db5 |
- Resolves: rhbz#1146976 - Drop conflicting obsoletes/provides
|
|
|
b59db5 |
|
|
|
b59db5 |
* Wed May 14 2014 Sami Wagiaalla <swagiaal@redhat.com> 1.0-29
|
|
|
b59db5 |
- Build for DTS 3
|
|
|
b59db5 |
- Change tomcat6 BRs to tomcat7
|
|
|
b59db5 |
- Correct Changelog dates.
|
|
|
b59db5 |
- Copy changes from Fedora.
|
|
|
b59db5 |
|
|
|
b59db5 |
* Wed Apr 17 2013 Krzysztof Daniel <kdaniel@redhat.com> 1.0-28
|
|
|
b59db5 |
- Drop Provides/Obsoletes.
|
|
|
b59db5 |
|
|
|
b59db5 |
* Wed Apr 17 2013 Krzysztof Daniel <kdaniel@redhat.com> 1.0-27
|
|
|
b59db5 |
- Rebuild to get proper dist macro value.
|
|
|
b59db5 |
|
|
|
b59db5 |
* Thu Dec 13 2012 Krzysztof Daniel <kdaniel@redhat.com> 1.0-26
|
|
|
b59db5 |
- Remove %%post and %%postun clauses.
|
|
|
b59db5 |
|
|
|
b59db5 |
* Fri Nov 23 2012 Krzysztof Daniel <kdaniel@redhat.com> 1.0-25
|
|
|
b59db5 |
- Initial contribution to SCL.
|
|
|
b59db5 |
|
|
|
b59db5 |
* Wed Jul 18 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0-24
|
|
|
b59db5 |
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
|
|
|
b59db5 |
|
|
|
b59db5 |
* Thu Jan 12 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0-23
|
|
|
b59db5 |
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
|
|
|
b59db5 |
|
|
|
b59db5 |
* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0-22
|
|
|
b59db5 |
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
|
|
|
b59db5 |
|
|
|
b59db5 |
* Thu Jul 8 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 1.0-21
|
|
|
b59db5 |
- Add license to javadoc subpackage
|
|
|
b59db5 |
|
|
|
b59db5 |
* Tue May 25 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 1.0-20
|
|
|
b59db5 |
- Use tomcat6-jsp and tomcat6-servlet APIs
|
|
|
b59db5 |
|
|
|
b59db5 |
* Mon May 24 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 1.0-19
|
|
|
b59db5 |
- Renamed package (jakarta-commons-el->apache-commons-el)
|
|
|
b59db5 |
- Dropped epoch, cleanup spec
|
|
|
b59db5 |
|
|
|
b59db5 |
* Wed Sep 09 2009 Fernando Nasser <fnasser@redhat.com> - 0:1.0-18.1
|
|
|
b59db5 |
- Merge with upstream for:
|
|
|
b59db5 |
Add pom and depmap fragment
|
|
|
b59db5 |
Removal of ghost symlink
|
|
|
b59db5 |
Some spec file cleanups
|
|
|
b59db5 |
- Build without AOT compilation
|
|
|
b59db5 |
|
|
|
b59db5 |
* Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.0-11.5
|
|
|
b59db5 |
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
|
|
|
b59db5 |
|
|
|
b59db5 |
* Wed Jul 08 2009 David Walluck <dwalluck@redhat.com> 0:1.0-18
|
|
|
b59db5 |
- fix scriptlets
|
|
|
b59db5 |
|
|
|
b59db5 |
* Wed Jul 08 2009 David Walluck <dwalluck@redhat.com> 0:1.0-17
|
|
|
b59db5 |
- fix pom install
|
|
|
b59db5 |
|
|
|
b59db5 |
* Wed Jul 08 2009 David Walluck <dwalluck@redhat.com> 0:1.0-16
|
|
|
b59db5 |
- add pom
|
|
|
b59db5 |
|
|
|
b59db5 |
* Mon Apr 27 2009 Milos Jakubicek <xjakub@fi.muni.cz> - 0:1.0-10.5
|
|
|
b59db5 |
- Fix FTBFS: added BR: tomcat5-jsp-2.0-api (resolves BZ#497179).
|
|
|
b59db5 |
|
|
|
b59db5 |
* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.0-10.4
|
|
|
b59db5 |
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
|
|
|
b59db5 |
|
|
|
b59db5 |
* Mon Feb 02 2009 David Walluck <dwalluck@redhat.com> 0:1.0-15
|
|
|
b59db5 |
- fix component-info.xml
|
|
|
b59db5 |
|
|
|
b59db5 |
* Wed Jan 21 2009 David Walluck <dwalluck@redhat.com> 0:1.0-14
|
|
|
b59db5 |
- fix jar name in repolib
|
|
|
b59db5 |
|
|
|
b59db5 |
* Tue Jan 20 2009 David Walluck <dwalluck@redhat.com> 0:1.0-13
|
|
|
b59db5 |
- fix repolib location
|
|
|
b59db5 |
|
|
|
b59db5 |
* Tue Jan 20 2009 David Walluck <dwalluck@redhat.com> 0:1.0-12
|
|
|
b59db5 |
- add repolib
|
|
|
b59db5 |
|
|
|
b59db5 |
* Wed Aug 13 2008 David Walluck <dwalluck@redhat.com> 0:1.0-11
|
|
|
b59db5 |
- update header
|
|
|
b59db5 |
|
|
|
b59db5 |
* Wed Aug 13 2008 David Walluck <dwalluck@redhat.com> 0:1.0-10
|
|
|
b59db5 |
- build for JPackage 5
|
|
|
b59db5 |
|
|
|
b59db5 |
* Mon Jul 14 2008 Andrew Overholt <overholt@redhat.com> 0:1.0-9.4
|
|
|
b59db5 |
- Update OSGi metadata for Eclipse 3.4.
|
|
|
b59db5 |
|
|
|
b59db5 |
* Wed Jul 9 2008 Tom "spot" Callaway <tcallawa@redhat.com> - 0:1.0-9.3
|
|
|
b59db5 |
- drop repotag
|
|
|
b59db5 |
- fix license tag
|
|
|
b59db5 |
|
|
|
b59db5 |
* Mon Feb 18 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 0:1.0-9jpp.2
|
|
|
b59db5 |
- Autorebuild for GCC 4.3
|
|
|
b59db5 |
|
|
|
b59db5 |
* Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 1.0-8jpp.2
|
|
|
b59db5 |
- Rebuild for selinux ppc32 issue.
|
|
|
b59db5 |
|
|
|
b59db5 |
* Wed Jul 11 2007 Ben Konrath <bkonrath@redhat.com> - 0:1.0-8jpp.1
|
|
|
b59db5 |
- Add eclipse-manifest patch.
|
|
|
b59db5 |
From Fernando Nasser <fnasser@redhat.com>:
|
|
|
b59db5 |
- Specify source 1.4 due to use of enum as identifier
|
|
|
b59db5 |
|
|
|
b59db5 |
* Fri Feb 09 2007 Fernando Nasser <fnasser@redhat.com> - 0:1.0-7jpp.1
|
|
|
b59db5 |
- Remove duplicate name tag
|
|
|
b59db5 |
- Rebuild
|
|
|
b59db5 |
|
|
|
b59db5 |
* Thu Aug 17 2006 Fernando Nasser <fnasser@redhat.com> - 0:1.0-7jpp.1
|
|
|
b59db5 |
- Merge with upstream
|
|
|
b59db5 |
|
|
|
b59db5 |
* Thu Aug 17 2006 Fernando Nasser <fnasser@redhat.com> - 0:1.0-7jpp
|
|
|
b59db5 |
- Fix AOT support
|
|
|
b59db5 |
|
|
|
b59db5 |
* Sat Jul 22 2006 Jakub Jelinek <jakub@redhat.com> - 0:1.0-5jpp_4fc
|
|
|
b59db5 |
- Rebuilt
|
|
|
b59db5 |
|
|
|
b59db5 |
* Wed Jul 12 2006 Jesse Keating <jkeating@redhat.com> - 0:1.0-5jpp_3fc
|
|
|
b59db5 |
- rebuild
|
|
|
b59db5 |
|
|
|
b59db5 |
* Fri May 19 2006 Fernando Nasser <fnasser@redhat.com> - 0:1.0-5jpp_2fc
|
|
|
b59db5 |
- Build with gcj_support enabled
|
|
|
b59db5 |
- Add missing BR for jsp (API)
|
|
|
b59db5 |
|
|
|
b59db5 |
* Fri May 19 2006 Fernando Nasser <fnasser@redhat.com> - 0:1.0-6jpp
|
|
|
b59db5 |
- Add AOT support
|
|
|
b59db5 |
|
|
|
b59db5 |
* Fri May 19 2006 Fernando Nasser <fnasser@redhat.com> - 0:1.0-5jpp_1fc
|
|
|
b59db5 |
- First build for FC6
|
|
|
b59db5 |
|
|
|
b59db5 |
* Fri May 19 2006 Fernando Nasser <fnasser@redhat.com> - 0:1.0-5jpp_0fc
|
|
|
b59db5 |
- Add gcj_support
|
|
|
b59db5 |
|
|
|
b59db5 |
* Wed Apr 26 2006 Fernando Nasser <fnasser@redhat.com> - 0:1.0-5jpp
|
|
|
b59db5 |
- First JPP 1.7 build
|
|
|
b59db5 |
|
|
|
b59db5 |
* Mon Mar 6 2006 Jeremy Katz <katzj@redhat.com> - 0:1.0-4jpp_6fc
|
|
|
b59db5 |
- stop scriptlet spew
|
|
|
b59db5 |
|
|
|
b59db5 |
* Fri Feb 10 2006 Jesse Keating <jkeating@redhat.com> - 0:1.0-4jpp_5fc
|
|
|
b59db5 |
- bump again for double-long bug on ppc(64)
|
|
|
b59db5 |
|
|
|
b59db5 |
* Wed Dec 21 2005 Jesse Keating <jkeating@redhat.com> - 0:1.0-4jpp_4fc
|
|
|
b59db5 |
- rebuilt again
|
|
|
b59db5 |
|
|
|
b59db5 |
* Fri Dec 09 2005 Jesse Keating <jkeating@redhat.com> - 0:1.0-4jpp_3fc
|
|
|
b59db5 |
- rebuilt
|
|
|
b59db5 |
|
|
|
b59db5 |
* Tue Jul 19 2005 Gary Benson <gbenson at redhat.com> - 0:1.0-4jpp_2fc
|
|
|
b59db5 |
- Build on ia64, ppc64, s390 and s390x.
|
|
|
b59db5 |
- Switch to aot-compile-rpm.
|
|
|
b59db5 |
|
|
|
b59db5 |
* Tue Jun 14 2005 Gary Benson <gbenson at redhat.com> - 0:1.0-4jpp_1fc
|
|
|
b59db5 |
- Upgrade to 1.0-4jpp.
|
|
|
b59db5 |
|
|
|
b59db5 |
* Thu May 26 2005 Gary Benson <gbenson at redhat.com> - 0:1.0-4jpp
|
|
|
b59db5 |
- Don't bundle servletapi sources (which weren't used anyway).
|
|
|
b59db5 |
|
|
|
b59db5 |
* Thu May 26 2005 Gary Benson <gbenson@redhat.com> - 0:1.0-3jpp_1fc
|
|
|
b59db5 |
- Upgrade to 1.0-3jpp.
|
|
|
b59db5 |
- Rearrange how BC-compiled stuff is built and installed.
|
|
|
b59db5 |
- Don't bundle servletapi sources (which weren't used anyway).
|
|
|
b59db5 |
|
|
|
b59db5 |
* Mon May 23 2005 Gary Benson <gbenson@redhat.com> - 0:1.0-2jpp_3fc
|
|
|
b59db5 |
- Add alpha to the list of build architectures (#157522).
|
|
|
b59db5 |
- Use absolute paths for rebuild-gcj-db.
|
|
|
b59db5 |
|
|
|
b59db5 |
* Thu May 5 2005 Gary Benson <gbenson@redhat.com> - 0:1.0-2jpp_2fc
|
|
|
b59db5 |
- BC-compile.
|
|
|
b59db5 |
|
|
|
b59db5 |
* Thu Jan 20 2005 Gary Benson <gbenson@redhat.com> - 0:1.0-2jpp_1fc
|
|
|
b59db5 |
- Build into Fedora.
|
|
|
b59db5 |
|
|
|
b59db5 |
* Thu Oct 21 2004 Fernando Nasser <fnasser@redhat.com> - 0:1.0-2jpp_2rh
|
|
|
b59db5 |
- Rebuild (no changes)
|
|
|
b59db5 |
|
|
|
b59db5 |
* Mon Aug 23 2004 Randy Watler <rwatler at finali.com> - 0:1.0-3jpp
|
|
|
b59db5 |
- Rebuild with ant-1.6.2
|
|
|
b59db5 |
|
|
|
b59db5 |
* Wed Jul 14 2004 Fernando Nasser <fnasser@redhat.com> - 0:1.0-2jpp_1rh
|
|
|
b59db5 |
- Merge with upstream version that removes dependency on ant-optional
|
|
|
b59db5 |
|
|
|
b59db5 |
* Tue Jun 01 2004 Randy Watler <rwatler at finali.com> - 0:1.0-2jpp
|
|
|
b59db5 |
- Upgrade to Ant 1.6.X
|
|
|
b59db5 |
|
|
|
b59db5 |
* Fri Jan 9 2004 Kaj J. Niemi <kajtzu@fi.basen.net> - 0:1.0-1jpp
|
|
|
b59db5 |
- First build for JPackage
|
|
|
b59db5 |
|
|
|
b59db5 |
* Wed Dec 17 2003 Kaj J. Niemi <kajtzu@fi.basen.net> - 0:1.0-0.2
|
|
|
b59db5 |
- With Javadocs
|
|
|
b59db5 |
|
|
|
b59db5 |
* Wed Dec 17 2003 Kaj J. Niemi <kajtzu@fi.basen.net> - 0:1.0-0.1
|
|
|
b59db5 |
- First build
|