diff --git a/.gitignore b/.gitignore index 9cb6bae..9de889a 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ commons-daemon-1.0.2-src.tar.gz /commons-daemon-1.0.8-src.tar.gz /commons-daemon-1.0.10-src.tar.gz /commons-daemon-1.0.11-src.tar.gz +/commons-daemon-1.0.12-src.tar.gz diff --git a/apache-commons-daemon-JAVA_OS.patch b/apache-commons-daemon-JAVA_OS.patch index 43280a6..b67b56e 100644 --- a/apache-commons-daemon-JAVA_OS.patch +++ b/apache-commons-daemon-JAVA_OS.patch @@ -1,7 +1,7 @@ ---- commons-daemon-1.0.11-src/src/native/unix/configure~ 2012-12-11 15:55:48.300816506 +0100 -+++ commons-daemon-1.0.11-src/src/native/unix/configure 2012-12-11 15:56:20.153550277 +0100 -@@ -3391,7 +3391,7 @@ - $as_echo "jni_md.h found in $JAVA_HOME/$JAVA_INC" >&6; } +--- commons-daemon-1.0.12-src/src/native/unix/configure~ 2013-01-14 07:45:15.000000000 +0100 ++++ commons-daemon-1.0.12-src/src/native/unix/configure 2013-01-24 15:55:59.757193071 +0100 +@@ -2776,7 +2776,7 @@ + echo "${ECHO_T}jni_md.h found in $JAVA_HOME/$JAVA_INC" >&6 INCLUDES="$INCLUDES -I$JAVA_HOME/include -I$JAVA_HOME/$JAVA_INC" else - INCLUDES="$INCLUDES -I$JAVA_HOME/include -I$JAVA_HOME/include/$supported_os" @@ -9,14 +9,3 @@ fi if test "$GCC" = "yes" ---- commons-daemon-1.0.11-src/src/native/unix/configure.in~ 2012-11-22 13:37:28.000000000 +0100 -+++ commons-daemon-1.0.11-src/src/native/unix/configure.in 2012-12-11 15:57:01.004206412 +0100 -@@ -98,7 +98,7 @@ - AC_MSG_RESULT([jni_md.h found in $JAVA_HOME/$JAVA_INC]) - INCLUDES="$INCLUDES -I$JAVA_HOME/include -I$JAVA_HOME/$JAVA_INC" - else -- INCLUDES="$INCLUDES -I$JAVA_HOME/include -I$JAVA_HOME/include/$supported_os" -+ INCLUDES="$INCLUDES -I$JAVA_HOME/include -I$JAVA_HOME/include/$JAVA_OS" - fi - - dnl ------------------------------------------------------------------------- diff --git a/apache-commons-daemon.spec b/apache-commons-daemon.spec index 205804f..ec74e8d 100644 --- a/apache-commons-daemon.spec +++ b/apache-commons-daemon.spec @@ -3,8 +3,8 @@ %global short_name commons-%{base_name} Name: apache-%{short_name} -Version: 1.0.11 -Release: 2%{?dist} +Version: 1.0.12 +Release: 1%{?dist} Summary: Defines API to support an alternative invocation mechanism License: ASL 2.0 Group: Applications/System @@ -103,16 +103,20 @@ install -Dpm 644 src/native/unix/jsvc.1 $RPM_BUILD_ROOT%{_mandir}/man1/jsvc.1 %files jsvc -%doc LICENSE.txt +%doc LICENSE.txt NOTICE.txt %{_bindir}/jsvc %{_mandir}/man1/jsvc.1* %files javadoc -f .mfiles-javadoc -%doc LICENSE.txt +%doc LICENSE.txt NOTICE.txt %changelog +* Thu Jan 24 2013 Mikolaj Izdebski - 1.0.12-1 +- Update to upstream version 1.0.12 +- Install NOTICE files + * Tue Jan 15 2013 Michal Srb - 1.0.11-2 - Build with xmvn - Spec file cleanup diff --git a/sources b/sources index f946e65..1bf05f2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -add541d9cdc099a18d11eecb1e0e33d6 commons-daemon-1.0.11-src.tar.gz +453b325951fb2527825b3fba35f48973 commons-daemon-1.0.12-src.tar.gz