Remove versioned symlinks
- Add workaround for rhbz#1015612
This commit is contained in:
parent
f67b37b8ae
commit
067562bde7
1 changed files with 13 additions and 14 deletions
|
|
@ -5,7 +5,7 @@
|
|||
|
||||
Name: apache-%{short_name}
|
||||
Version: 1.0
|
||||
Release: 28%{?dist}
|
||||
Release: 29%{?dist}
|
||||
Summary: The Apache Commons Extension Language
|
||||
License: ASL 1.1
|
||||
URL: http://commons.apache.org/%{base_name}
|
||||
|
|
@ -53,6 +53,9 @@ servletapi.build.notrequired=true
|
|||
jspapi.build.notrequired=true
|
||||
EOBP
|
||||
|
||||
# workaround for https://bugzilla.redhat.com/show_bug.cgi?id=1015612
|
||||
find . -iname 'ELParser.java' -exec sed -i 's:enum:enum1:g' \{\} \;
|
||||
|
||||
%build
|
||||
export CLASSPATH=
|
||||
export OPT_JAR_LIST=:
|
||||
|
|
@ -64,29 +67,21 @@ export OPT_JAR_LIST=:
|
|||
|
||||
%install
|
||||
# jars
|
||||
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
|
||||
install -p -m 644 dist/%{short_name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
|
||||
pushd $RPM_BUILD_ROOT%{_javadir}
|
||||
for jar in *-%{version}*; do
|
||||
ln -sf ${jar} `echo $jar| sed "s|apache-||g"`
|
||||
ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`
|
||||
ln -sf ${jar} `echo $jar| sed "s|apache-\(.*\)-%{version}|\1|g"`
|
||||
done
|
||||
popd # come back from javadir
|
||||
install -d -m 755 %{buildroot}%{_javadir}
|
||||
install -p -m 644 dist/%{short_name}.jar %{buildroot}%{_javadir}/%{name}.jar
|
||||
ln -sf %{name}.jar %{buildroot}%{_javadir}/%{short_name}.jar
|
||||
|
||||
# pom
|
||||
install -pD -T -m 644 %{SOURCE1} %{buildroot}%{_mavenpomdir}/JPP-%{short_name}.pom
|
||||
%add_maven_depmap JPP-%{short_name}.pom %{short_name}.jar -a "org.apache.commons:commons-el"
|
||||
|
||||
# javadoc
|
||||
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
|
||||
cp -pr dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
|
||||
install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
|
||||
cp -pr dist/docs/api/* %{buildroot}%{_javadocdir}/%{name}
|
||||
|
||||
%files
|
||||
%doc LICENSE.txt STATUS.html
|
||||
%{_javadir}/%{name}-%{version}.jar
|
||||
%{_javadir}/%{name}.jar
|
||||
%{_javadir}/%{short_name}-%{version}.jar
|
||||
%{_javadir}/%{short_name}.jar
|
||||
%{_mavenpomdir}/JPP-%{short_name}.pom
|
||||
%{_mavendepmapfragdir}/%{name}
|
||||
|
|
@ -97,6 +92,10 @@ cp -pr dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
|
|||
|
||||
|
||||
%changelog
|
||||
* Tue Oct 08 2013 Stanislav Ochotnicky <sochotnicky@redhat.com> - 1.0-29
|
||||
- Remove versioned symlinks
|
||||
- Add workaround for rhbz#1015612
|
||||
|
||||
* Mon Aug 05 2013 Michal Srb <msrb@redhat.com> - 1.0-28
|
||||
- Switch to %%add_maven_depmap (Resolves: #991969)
|
||||
|
||||
|
|
|
|||
Reference in a new issue