Mailinglist Archive: opensuse-commit (861 mails)

< Previous Next >
commit jakarta-commons-daemon for openSUSE:Factory

Hello community,

here is the log from the commit of package jakarta-commons-daemon for
openSUSE:Factory
checked in at Tue Jan 25 09:17:58 CET 2011.



--------
--- jakarta-commons-daemon/jakarta-commons-daemon.changes 2009-08-26
13:56:55.000000000 +0200
+++
/mounts/work_src_done/STABLE/jakarta-commons-daemon/jakarta-commons-daemon.changes
2011-01-19 19:05:36.000000000 +0100
@@ -1,0 +2,7 @@
+Wed Jan 19 18:04:43 UTC 2011 - bitshuffler@xxxxxxxxxxxx
+
+- Updated to 1.0.5.
+- Reworked spec.
+- Removed obsolete patches.
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


Old:
----
daemon-1.0.1.tar.gz
jakarta-commons-daemon-crosslink.patch
jakarta-commons-daemon-java14compat.patch

New:
----
commons-daemon-1.0.4-return_value.patch
commons-daemon-1.0.5-src.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ jakarta-commons-daemon.spec ++++++
--- /var/tmp/diff_new_pack.Q3v9rG/_old 2011-01-25 09:17:33.000000000 +0100
+++ /var/tmp/diff_new_pack.Q3v9rG/_new 2011-01-25 09:17:33.000000000 +0100
@@ -1,7 +1,7 @@
#
-# spec file for package jakarta-commons-daemon (Version 1.0.1)
+# spec file for package jakarta-commons-daemon
#
-# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,137 +16,96 @@
#

# norootforbuild
-# icecream 0


Name: jakarta-commons-daemon
-BuildRequires: ant java2-devel-packages xml-commons-apis
-%define native %{?_with_native:1}%{!?_with_native:0}
-%define base_name daemon
-%define short_name commons-%{base_name}
-%define name jakarta-%{short_name}
-%define section free
-Version: 1.0.1
-Release: 266
-Summary: Jakarta Commons Daemon Package
-License: Apache Software License ..
-Group: Development/Libraries/Java
-Url: http://jakarta.apache.org/commons/daemon/
-Source0:
http://www.apache.org/dist/jakarta/commons/daemon/source/daemon-1.0.1.tar.gz
-Patch: %{name}-crosslink.patch
-Patch1: %{name}-java14compat.patch
+Version: 1.0.5
+Release: 1
+License: Apache v2.0
+Group: System/Daemons
+Url: http://commons.apache.org/daemon/
+Source: commons-daemon-%{version}-src.tar.bz2
+Patch0: commons-daemon-1.0.4-return_value.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-%if %{native}
-%else
-BuildArch: noarch
-%endif
-Provides: %{short_name}
-Obsoletes: %{short_name}
+BuildRequires: ant
+BuildRequires: java-devel
+BuildRequires: libcap-devel
+Requires: jakarta-commons-daemon-java = %{version}
+Provides: jsvc = %{version}-%{release}
+Summary: Commons Daemon - Controlling of Java Daemons

%description
-The scope of this package is to define an API in line with the current
-Java(tm) Platform APIs to support an alternative invocation mechanism
-that could be used instead of the public static void main(String[])
-method. This specification covers the behavior and life cycle of what
-is defined as Java(tm) daemons or, in other words, noninteractive
-Java(tm) applications.
-
-
+The Daemon Component contains a set of Java and native code, including
+a set of Java interfaces applications must implement and Unix native
+code to control a Java daemon from a Unix operating system.

-%package jsvc
-License: Apache Software License ..
-Summary: Java daemon launcher
+%package java
+License: Apache v2.0
Group: Development/Libraries/Java
-Provides: jsvc = %{version}-%{release}
-
-%description jsvc
-The scope of this package is to define an API in line with the current
-Java(tm) Platform APIs to support an alternative invocation mechanism
-which could be used instead of the above mentioned public static void
-main(String[]) method. This specification cover the behavior and life
-cycle of what we define as Java(tm) daemons, or, in other words, non
-interactive Java(tm) applications.
-
-This package contains the Java daemon launcher.
-
-
+BuildArch: noarch
+Requires: java >= 1.5
+Provides: commons-daemon > 1.0.1
+Obsoletes: commons-daemon <= 1.0.1
+Summary: Commons Daemon Java Libraries

-%{summary}.
+%description java
+The Java libraries for Commons Daemon.

%package javadoc
-License: Apache Software License ..
-PreReq: coreutils
-Summary: Javadoc for jakarta-commons-daemon
-Group: Development/Libraries/Java
+License: Apache v2.0
+Group: Documentation/Other
+BuildArch: noarch
+Summary: Commons Daemon Javadoc

%description javadoc
-The scope of this package is to define an API in line with the current
-Java(tm) Platform APIs to support an alternative invocation mechanism
-which could be used instead of the above mentioned public static void
-main(String[]) method. This specification cover the behavior and life
-cycle of what we define as Java(tm) daemons, or, in other words, non
-interactive Java(tm) applications.
-
-This package contains the javadoc documentation for
-jakarta-commons-daemon.
-
+The Javadoc Documentation for Commons Daemon.


%prep
-%setup -q -n %{base_name}-%{version}
-%patch -p0
-%patch1
-chmod 644 src/samples/*
+%setup -qn commons-daemon-%{version}-src
+%patch0

%build
-%if %{native}
-cd src/native/unix
-%configure --with-java=%{java_home}
-make %{?_smp_mflags}
-%else
-ant -Dant.lib=%{_javadir} -Dj2se.javadoc=%{_javadocdir}/java dist
-%endif
+pushd src/native/unix
+%configure
+%__make %{?_smp_mflags}
+popd
+ant jar test javadoc

%install
-%if %{native}
-install -Dpm 755 src/native/unix/jsvc $RPM_BUILD_ROOT%{_sbindir}/jsvc
-%else
-# jars
-install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
-install -pm 644 dist/%{short_name}.jar \
- $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
-(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar}
`echo $jar| sed "s|jakarta-||g"`; done)
-(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar}
`echo $jar| sed "s|-%{version}||g"`; done)
-# javadoc
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -pr dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
-%endif
+%__install -Dm 0755 src/native/unix/jsvc %{buildroot}%{_sbindir}/jsvc
+%__install -Dm 0644 dist/commons-daemon-%{version}.jar
%{buildroot}%{_javadir}/commons-daemon-%{version}.jar
+%__ln_s %{_javadir}/commons-daemon-%{version}.jar
%{buildroot}%{_javadir}/commons-daemon.jar
+%__ln_s %{_javadir}/commons-daemon-%{version}.jar
%{buildroot}%{_javadir}/jakarta-commons-daemon.jar
+%__ln_s %{_javadir}/commons-daemon-%{version}.jar
%{buildroot}%{_javadir}/jakarta-commons-daemon-%{version}.jar
+
+%__install -d %{buildroot}%{_javadocdir}/commons-daemon-%{version}
+cp -a dist/docs/api/* %{buildroot}%{_javadocdir}/commons-daemon-%{version}
+%__ln_s %{_javadocdir}/commons-daemon-%{version}
%{buildroot}%{_javadocdir}/commons-daemon
+%__ln_s %{_javadocdir}/commons-daemon-%{version}
%{buildroot}%{_javadocdir}/jakarta-commons-daemon
+%__ln_s %{_javadocdir}/commons-daemon-%{version}
%{buildroot}%{_javadocdir}/jakarta-commons-daemon-%{version}

%clean
-rm -rf $RPM_BUILD_ROOT
+test "%{buildroot}" != "/" && %__rm -rf %{buildroot}

-%post javadoc
-rm -f %{_javadocdir}/%{name}
-ln -s %{name}-%{version} %{_javadocdir}/%{name}
-%if %{native}
-
-%files jsvc
-%defattr(-,root,root,-)
-%doc LICENSE*
+%files
+%defattr(-,root,root)
+%doc RELEASE-NOTES.txt
%{_sbindir}/jsvc
-%else

-%files
-%defattr(-,root,root,-)
-%doc LICENSE* PROPOSAL.html RELEASE-NOTES.txt STATUS.html src/samples
-%doc src/docs/*
-%{_javadir}/*
+%files java
+%defattr(-,root,root)
+%{_javadir}/commons-daemon.jar
+%{_javadir}/commons-daemon-%{version}.jar
+%{_javadir}/jakarta-commons-daemon.jar
+%{_javadir}/jakarta-commons-daemon-%{version}.jar

%files javadoc
-%defattr(-,root,root,-)
-%doc %{_javadocdir}/%{name}-%{version}
-%ghost %doc %{_javadocdir}/%{name}
-%endif
+%defattr(-,root,root)
+%doc src/docs/*
+%{_javadocdir}/commons-daemon
+%doc %{_javadocdir}/commons-daemon-%{version}
+%{_javadocdir}/jakarta-commons-daemon
+%{_javadocdir}/jakarta-commons-daemon-%{version}

%changelog

++++++ commons-daemon-1.0.4-return_value.patch ++++++
Index: src/native/unix/native/jsvc-unix.c
===================================================================
--- src/native/unix/native/jsvc-unix.c.orig 2010-10-16 15:09:11.000000000
+0200
+++ src/native/unix/native/jsvc-unix.c 2010-12-18 15:47:04.021292901 +0100
@@ -818,6 +818,7 @@ static int logger_child(int out_fd, int
}
}
}
+ return 0;
}

/**

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread
  • No further messages