- Drop gpg verification. We can stick to what osc services do for us

OBS-URL: https://build.opensuse.org/package/show/Java:packages/apache-commons-daemon?expand=0&rev=16
This commit is contained in:
Tomáš Chvátal 2015-03-25 09:16:10 +00:00 committed by Git OBS Bridge
parent 128ea55b93
commit 87c947ef98
2 changed files with 16 additions and 27 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Mar 25 09:15:36 UTC 2015 - tchvatal@suse.com
- Drop gpg verification. We can stick to what osc services do for us
-------------------------------------------------------------------
Tue Mar 24 13:54:27 UTC 2015 - tchvatal@suse.com

View File

@ -17,7 +17,6 @@
%define short_name commons-daemon
Name: apache-%{short_name}
Version: 1.0.15
Release: 0
@ -32,23 +31,17 @@ Patch0: apache-commons-daemon-JAVA_OS.patch
Patch1: apache-commons-daemon-s390x.patch
Patch2: apache-commons-daemon-ppc64.patch
Patch3: apache-commons-daemon-aarch64.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: ant
BuildRequires: apache-commons-parent
BuildRequires: java-devel
BuildRequires: javapackages-tools
BuildRequires: libcap-devel
BuildRequires: xmlto
%if 0%{?suse_version} >= 1230
BuildRequires: gpg-offline
%endif
Provides: jakarta-%{short_name} = %{version}-%{release}
Provides: jakarta-%{short_name} = %{version}
Obsoletes: jakarta-%{short_name} < %{version}
Provides: jakarta-%{short_name}-java = %{version}-%{release}
Provides: jakarta-%{short_name}-java = %{version}
Obsoletes: jakarta-%{short_name}-java < %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
The Daemon Component contains a set of Java and native code, including
@ -69,21 +62,16 @@ privileged operations as root (e.g. bind to a port < 1024), and then switch
identity to a non-privileged user.
%package javadoc
BuildArch: noarch
Summary: Commons Daemon Javadoc
Group: Documentation/Other
Provides: jakarta-%{short_name}-javadoc = %{version}-%{release}
Obsoletes: jakarta-%{short_name}-javadoc < %{version}
BuildArch: noarch
%description javadoc
The Javadoc Documentation for Commons Daemon.
The Javadoc Documentation for Commons Daemon.
%prep
%if 0%{?suse_version} >= 1230
%gpg_verify %{SOURCE1}
%endif
%setup -q -n %{short_name}-%{version}-src
%patch0 -p1
%patch1 -p1
@ -105,31 +93,27 @@ xmlto man man/jsvc.1.xml
# build native jsvc
%configure --with-java=%{java_home}
# this is here because 1.0.2 archive contains old *.o
make clean
make %{?_smp_mflags} clean
make %{?_smp_mflags}
popd
ant jar test javadoc
%install
# install native jsvc
install -Dm 0755 src/native/unix/jsvc %{buildroot}%{_bindir}/jsvc
install -Dpm 644 src/native/unix/jsvc.1 $RPM_BUILD_ROOT%{_mandir}/man1/jsvc.1
install -Dpm 644 src/native/unix/jsvc.1 %{buildroot}%{_mandir}/man1/jsvc.1
# jars
install -Dpm 644 dist/%{short_name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
install -Dpm 644 dist/%{short_name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
ln -sf %{name}.jar %{buildroot}%{_javadir}/%{short_name}.jar
# pom
install -Dpm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
install -Dpm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
%add_maven_depmap JPP-%{name}.pom %{name}.jar -a "org.apache.commons:%{short_name}"
# javadoc
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
cp -pr dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
%clean
rm -rf %{buildroot}
install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
cp -pr dist/docs/api/* %{buildroot}%{_javadocdir}/%{name}
%files
%defattr(-,root,root)