rpms/slf4j
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Remove wagon-ssh build extension

Browse Source 
- Disable slf4j-android module
This commit is contained in:
Mikolaj Izdebski 2014-03-06 13:34:06 +01:00
parent 606b8d3c8a
commit dd0cdcfded
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
slf4j.spec
View File

@ -89,6 +89,7 @@ cp -p %{SOURCE1} APACHE-LICENSE
%pom_disable_module integration %pom_disable_module integration
%pom_disable_module osgi-over-slf4j %pom_disable_module osgi-over-slf4j
%pom_disable_module slf4j-android
%pom_remove_plugin :maven-source-plugin %pom_remove_plugin :maven-source-plugin
# Because of a non-ASCII comment in slf4j-api/src/main/java/org/slf4j/helpers/MessageFormatter.java # Because of a non-ASCII comment in slf4j-api/src/main/java/org/slf4j/helpers/MessageFormatter.java
@ -106,6 +107,9 @@ cp -p %{SOURCE1} APACHE-LICENSE
%{_bindir}/find -name "*.css" -o -name "*.js" -o -name "*.txt" | \ %{_bindir}/find -name "*.css" -o -name "*.js" -o -name "*.txt" | \
%{_bindir}/xargs -t %{__perl} -pi -e 's/\r$//g' %{_bindir}/xargs -t %{__perl} -pi -e 's/\r$//g'
# Remove wagon-ssh build extension
%pom_xpath_remove pom:extensions
# The general pattern is that the API package exports API classes and does # The general pattern is that the API package exports API classes and does
# not require impl classes. slf4j was breaking that causing "A cycle was # not require impl classes. slf4j was breaking that causing "A cycle was
# detected when generating the classpath slf4j.api, slf4j.nop, slf4j.api." # detected when generating the classpath slf4j.api, slf4j.nop, slf4j.api."
@ -141,6 +145,10 @@ cp -pr target/site/* $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-manual
%doc LICENSE.txt APACHE-LICENSE %doc LICENSE.txt APACHE-LICENSE
%changelog %changelog
* Thu Mar 6 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:1.7.6-2
- Remove wagon-ssh build extension
- Disable slf4j-android module
* Tue Mar 04 2014 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0:1.7.6-2 * Tue Mar 04 2014 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0:1.7.6-2
- Use Requires: java-headless rebuild (#1067528) - Use Requires: java-headless rebuild (#1067528)