rpms/jdom2
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Use .mfiles generated during build, fix log4j dep

Browse Source
This commit is contained in:
gil 2014-06-08 20:17:07 +02:00
parent e147d30902
commit aa3c40f05a
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
jdom2.spec
View File

@ -27,7 +27,7 @@ BuildRequires: cobertura
BuildRequires: isorelax BuildRequires: isorelax
BuildRequires: jakarta-oro BuildRequires: jakarta-oro
BuildRequires: jaxen BuildRequires: jaxen
BuildRequires: log4j BuildRequires: log4j12
BuildRequires: objectweb-asm3 BuildRequires: objectweb-asm3
BuildRequires: xalan-j2 BuildRequires: xalan-j2
BuildRequires: xerces-j2 BuildRequires: xerces-j2
@ -65,6 +65,7 @@ find . -name "*.jar" -print -delete
%patch0 -p0 %patch0 -p0
sed -i "s|%{_javadir}/objectweb-asm|%{_javadir}/objectweb-asm3|" build.xml sed -i "s|%{_javadir}/objectweb-asm|%{_javadir}/objectweb-asm3|" build.xml
sed -i "s|log4j.jar|log4j12-12.jar|" build.xml
%patch1 -p1 %patch1 -p1
cp -p %{SOURCE1} maven/contrib.pom cp -p %{SOURCE1} maven/contrib.pom
@ -95,10 +96,8 @@ install -pm 644 build/maven/core/%{name}-%{version}-junit.pom %{buildroot}%{_mav
mkdir -p %{buildroot}%{_javadocdir} mkdir -p %{buildroot}%{_javadocdir}
cp -rp build/apidocs %{buildroot}%{_javadocdir}/%{name} cp -rp build/apidocs %{buildroot}%{_javadocdir}/%{name}
%files %files -f .mfiles
%{_javadir}/%{name} %dir %{_javadir}/%{name}
%{_mavenpomdir}/JPP.%{name}-*.pom
%{_mavendepmapfragdir}/%{name}
%doc CHANGES.txt COMMITTERS.txt LICENSE.txt README.txt TODO.txt %doc CHANGES.txt COMMITTERS.txt LICENSE.txt README.txt TODO.txt
%files javadoc %files javadoc