Hello community, here is the log from the commit of package csync2 for openSUSE:Factory checked in at 2017-08-13 14:59:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/csync2 (Old) and /work/SRC/openSUSE:Factory/.csync2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "csync2" Sun Aug 13 14:59:30 2017 rev:21 rq:516067 version:2.0+git.1461714863.10636a4 Changes: -------- --- /work/SRC/openSUSE:Factory/csync2/csync2.changes 2017-07-17 09:11:31.452844092 +0200 +++ /work/SRC/openSUSE:Factory/.csync2.new/csync2.changes 2017-08-13 14:59:31.285999838 +0200 @@ -1,0 +2,11 @@ +Thu Jul 19 13:46:24 UTC 2017 - tchva...@suse.com + +- Remove systemd dep in favor of systemd-rpm-macros +- Format a bit with spec-cleaner +- Add proper dependency over openssl +- Remove all the tex deps as we now reduce from 300 to 160 buildrequires +- Remove xinetd service and use only socket activation to keep + only one tool for the job + * Also remove patch csync2-fix-xinetd.patch + +------------------------------------------------------------------- Old: ---- csync2-fix-xinetd.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ csync2.spec ++++++ --- /var/tmp/diff_new_pack.PGkCpO/_old 2017-08-13 14:59:32.457835378 +0200 +++ /var/tmp/diff_new_pack.PGkCpO/_new 2017-08-13 14:59:32.469833695 +0200 @@ -16,13 +16,12 @@ # -Summary: Cluster synchronization tool -License: GPL-2.0+ -Group: Productivity/Clustering/HA - Name: csync2 Version: 2.0+git.1461714863.10636a4 Release: 0 +Summary: Cluster synchronization tool +License: GPL-2.0+ +Group: Productivity/Clustering/HA Url: http://oss.linbit.com/csync2/ #Source0: http://oss.linbit.com/csync2/%{name}-%{version}.tar.gz Source0: %{name}-%{version}.tar.bz2 @@ -30,15 +29,12 @@ Source2: csync2-rm-ssl-cert Source3: csync2.socket Source4: csync2@.service -# PATCH-FIX-UPSTREAM -- csync2-fix-xinetd.patch tser...@suse.com -- disables csync2 in xinetd by default, fixes port. -Patch0: csync2-fix-xinetd.patch # PATCH-FIX-UPSTREAM -- add-ac_prog_cpp.patch tser...@suse.com -- fix ugly ./configure warnings about missing headers Patch10: add-ac_prog_cpp.patch # PATCH-FIX-UPSTREAM -- fix-sonames.patch tser...@suse.com -- use properly versioned sonames in dlopen() Patch12: fix-sonames.patch # PATCH-FIX-UPSTREAM -- add-COPYING.patch tser...@suse.com -- ensure COPYING is present in docfiles and thus %doc Patch13: add-COPYING.patch - BuildRequires: autoconf BuildRequires: automake BuildRequires: bison @@ -47,21 +43,13 @@ BuildRequires: librsync-devel BuildRequires: pkgconfig BuildRequires: sqlite3-devel +BuildRequires: systemd-rpm-macros +Requires: sqlite3 +Requires(post): openssl %if 0%{?suse_version} > 1320 # Conflicts with net-tools in Leap Requires(post): hostname %endif -Requires(post): openssl -Requires: sqlite3 -%if 0%{?suse_version} >= 1210 -BuildRequires: systemd -%endif -# texlive is for pdflatex to build PDF version of the manual -BuildRequires: texlive-latex -%if 0%{?suse_version} > 1220 -BuildRequires: texlive-nopageno -%endif -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Csync2 is a cluster synchronization tool. It can be used to keep files on @@ -71,25 +59,21 @@ %prep %setup -q -%{?suse_update_config:%{suse_update_config}} - -%patch0 -p1 %patch10 -p1 %patch12 -p1 %patch13 -p1 %build -export CFLAGS="%{optflags}" -if ! [ -f configure ]; then ./autogen.sh; fi -%configure --enable-sqlite3 \ - --sysconfdir=%{_sysconfdir}/csync2 --docdir=%{_docdir}/%{name} - +autoreconf -fvi +%configure \ + --enable-sqlite3 \ + --sysconfdir=%{_sysconfdir}/csync2 \ + --docdir=%{_docdir}/%{name} make %{?_smp_mflags} %install %make_install mkdir -p %{buildroot}%{_localstatedir}/lib/csync2 -install -p -D -m 644 csync2.xinetd %{buildroot}%{_sysconfdir}/xinetd.d/csync2 install -p -m 644 %{SOURCE1} %{buildroot}%{_docdir}/%{name}/README.quickstart install -p -m 755 %{SOURCE2} %{buildroot}%{_sbindir}/csync2-rm-ssl-cert mkdir -p %{buildroot}%{_unitdir} @@ -106,14 +90,14 @@ %service_add_post csync2.socket umask 077 if [ ! -f %{_sysconfdir}/csync2/csync2_ssl_key.pem ]; then -/usr/bin/openssl genrsa -rand /proc/apm:/proc/cpuinfo:/proc/dma:/proc/filesystems:/proc/interrupts:/proc/ioports:/proc/pci:/proc/rtc:/proc/uptime 1024 > %{_sysconfdir}/csync2/csync2_ssl_key.pem 2>/dev/null +%{_bindir}/openssl genrsa -rand /proc/apm:/proc/cpuinfo:/proc/dma:/proc/filesystems:/proc/interrupts:/proc/ioports:/proc/pci:/proc/rtc:/proc/uptime 1024 > %{_sysconfdir}/csync2/csync2_ssl_key.pem 2>/dev/null fi FQDN=`hostname` if [ "x${FQDN}" = "x" ]; then FQDN=localhost.localdomain fi if [ ! -f %{_sysconfdir}/csync2/csync2_ssl_cert.pem ]; then -cat << EOF | /usr/bin/openssl req -new -key %{_sysconfdir}/csync2/csync2_ssl_key.pem -x509 -days 3000 -out %{_sysconfdir}/csync2/csync2_ssl_cert.pem 2>/dev/null +cat << EOF | %{_bindir}/openssl req -new -key %{_sysconfdir}/csync2/csync2_ssl_key.pem -x509 -days 3000 -out %{_sysconfdir}/csync2/csync2_ssl_cert.pem 2>/dev/null -- SomeState SomeCity @@ -135,7 +119,6 @@ %service_del_postun csync2.socket %files -%defattr(-,root,root) %{_sbindir}/csync2 %{_sbindir}/csync2-compare %{_unitdir}/csync2.socket @@ -145,7 +128,6 @@ %{_docdir}/%{name} %dir %{_sysconfdir}/csync2/ %config(noreplace) %{_sysconfdir}/csync2/csync2.cfg -%config(noreplace) %{_sysconfdir}/xinetd.d/csync2 %ghost %config %{_sysconfdir}/csync2/csync2_ssl_key.pem %ghost %config %{_sysconfdir}/csync2/csync2_ssl_cert.pem %{_sbindir}/csync2-rm-ssl-cert
