Hello community,
here is the log from the commit of package couchdb for openSUSE:Factory checked
in at 2015-05-25 11:17:07
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/couchdb (Old)
and /work/SRC/openSUSE:Factory/.couchdb.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "couchdb"
Changes:
--------
--- /work/SRC/openSUSE:Factory/couchdb/couchdb.changes 2015-02-18
12:08:50.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.couchdb.new/couchdb.changes 2015-05-25
11:17:08.000000000 +0200
@@ -1,0 +2,9 @@
+Sun May 24 21:12:40 UTC 2015 - mplus...@suse.com
+
+- Add gpg signature
+- Cleanup spec file with spec-cleaner
+- Add rc symlink for service
+- Add missing systemd scriplets
+- Add build depnendcy on curl-devel
+
+-------------------------------------------------------------------
New:
----
apache-couchdb-1.6.1.tar.gz.asc
couchdb.keyring
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ couchdb.spec ++++++
--- /var/tmp/diff_new_pack.noyixJ/_old 2015-05-25 11:17:09.000000000 +0200
+++ /var/tmp/diff_new_pack.noyixJ/_new 2015-05-25 11:17:09.000000000 +0200
@@ -21,14 +21,12 @@
%define couchdb_group couchdb
%define couchdb_log %{_localstatedir}/log/%{name}
%define couchdb_home %{_localstatedir}/lib/%{name}
-
# This should be in RPM as %%{_runstatedir}
%if 0%{?suse_version} >= 1230
%define runstatedir /run/%{name}
%else
%define runstatedir %{_localstatedir}/run/%{name}
%endif
-
Name: couchdb
Version: 1.6.1
Release: 0
@@ -41,40 +39,43 @@
Source2: %{name}.sysconfig
Source3: %{name}.service
Source4: %{name}.tmpfiles.conf
+Source5:
http://www.apache.org/dist/%{name}/source/%{version}/apache-couchdb-%{version}.tar.gz.asc
+Source6: %{name}.keyring
Patch0: couchdb-futon-default-view-language.patch
# PATCH-FIX-UPSTREAM couchdb-glibc-2.20.patch dims...@opensuse.org -- Fix
build with glibc 2.20; _BSD_SOURCE is deprecated in favor of _DEFAULT_SOURCE;
using both for backwards compatibility
Patch1: couchdb-glibc-2.20.patch
Patch2: apache-couchdb-1.6.1-fix-bashisms.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: autoconf-archive
BuildRequires: automake
+BuildRequires: curl-devel
BuildRequires: erlang
BuildRequires: gcc-c++
BuildRequires: help2man
BuildRequires: libicu-devel
BuildRequires: libtool
BuildRequires: makeinfo
-%if 0%{?suse_version} < 1200
-BuildRequires: mozilla-xulrunner192-devel
-%else
-BuildRequires: js-devel
-%endif
BuildRequires: pkgconfig
Requires: erlang
Requires: logrotate
Requires(post): aaa_base
Requires(post): info
-Requires(preun):aaa_base
-Requires(preun):info
+Requires(pre): %fillup_prereq
# Users and groups
Requires(pre): pwdutils
+Requires(preun): aaa_base
+Requires(preun): info
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
+%if 0%{?suse_version} < 1200
+BuildRequires: mozilla-xulrunner192-devel
+%else
+BuildRequires: js-devel
+%endif
%if 0%{?suse_version} >= 1230
BuildRequires: pkgconfig(systemd)
%{?systemd_requires}
%else
Requires(pre): %insserv_prereq
%endif
-Requires(pre): %fillup_prereq
%description
Apache CouchDB is a distributed, fault-tolerant and schema-free
@@ -105,17 +106,18 @@
make %{?_smp_mflags}
%install
-%makeinstall
-chmod -x %{buildroot}/usr/share/couchdb/server/main{,-coffee}.js
+make DESTDIR=%{buildroot} install %{?_smp_mflags}
+chmod -x %{buildroot}%{_datadir}/couchdb/server/main{,-coffee}.js
+install -d %{buildroot}%{_sbindir}
%if 0%{?suse_version} >= 1230
# Service & tmpfiles config
install -D -m 0644 %{SOURCE3} %{buildroot}%{_unitdir}/%{name}.service
-install -d -m 0755 %{buildroot}/usr/lib/tmpfiles.d/
-install -D -m 0644 %{SOURCE4} %{buildroot}/usr/lib/tmpfiles.d/%{name}.conf
+install -d -m 0755 %{buildroot}%{_libexecdir}/tmpfiles.d/
+install -D -m 0644 %{SOURCE4}
%{buildroot}%{_libexecdir}/tmpfiles.d/%{name}.conf
+ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name}
%else
# sysvinit script
install -D -m 0755 %{SOURCE1} %{buildroot}%{_initddir}/%{name}
-install -d %{buildroot}%{_sbindir}
ln -s %{_initddir}/%{name} %{buildroot}%{_sbindir}/rc%{name}
# Sysconfig template
mkdir -p %{buildroot}%{_var}/adm/fillup-templates/
@@ -127,7 +129,7 @@
rm %{buildroot}%{_sysconfdir}/rc.d/%{name}
rm -rf %{buildroot}%{_datadir}/doc/%{name}
# clean-up .la archives
-find %{buildroot} -name '*.la' -delete -print
+find %{buildroot} -type f -name "*.la" -delete -print
%pre
getent group %{couchdb_group} >/dev/null || groupadd -r %{couchdb_group} || :
@@ -138,13 +140,21 @@
useradd -r -g %{couchdb_group} -d %{couchdb_home} -s $(which nologin) \
-c "Couchdb Database Server" %{couchdb_user} || :
fi
+%if 0%{?suse_version} >= 1230
+%service_add_pre %{name}.service
+%endif
%post
install -o %{couchdb_user} -g %{couchdb_group} -d %{runstatedir}
%if 0%{?suse_version} >= 1230
-%{fillup_only}
+%fillup_only
%service_add_post %{name}.service
+%if 0%{?suse_version} > 1320
+%tmpfiles_create %{_libexecdir}/tmpfiles.d/%{name}.conf
+%else
+systemd-tmpfiles --create %{_libexecdir}/tmpfiles.d/%{name}.conf
+%endif
%else
%{fillup_and_insserv %{name}}
%endif
@@ -181,9 +191,9 @@
%{_libexecdir}/tmpfiles.d/%{name}.conf
%else
%{_initddir}/%{name}
-%{_sbindir}/rc%{name}
%{_var}/adm/fillup-templates/sysconfig.%{name}
%endif
+%{_sbindir}/rc%{name}
%{_bindir}/*
%{_libdir}/%{name}
%{_datadir}/%{name}
