Hello community, here is the log from the commit of package cvs for openSUSE:Factory checked in at 2017-06-20 10:59:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cvs (Old) and /work/SRC/openSUSE:Factory/.cvs.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cvs" Tue Jun 20 10:59:01 2017 rev:30 rq:503933 version:1.12.12 Changes: -------- --- /work/SRC/openSUSE:Factory/cvs/cvs.changes 2013-03-25 20:17:05.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.cvs.new/cvs.changes 2017-06-20 10:59:26.455621507 +0200 @@ -1,0 +2,15 @@ +Thu Jun 15 11:38:00 UTC 2017 - [email protected] + +- Update dependencies: + * enable kerberos + * explicitly require ssh + +------------------------------------------------------------------- +Thu Jun 15 09:41:35 UTC 2017 - [email protected] + +- Update bit with spec-cleaner +- Use proper url for docu and do not recompress: + * OpenSourceDevWithCVS_2E.tar.gz instead of bz2 +- Add systemd socket service to replace the xinetd service + +------------------------------------------------------------------- Old: ---- OpenSourceDevWithCVS_2E.tar.bz2 xinetd.conf New: ---- OpenSourceDevWithCVS_2E.tar.gz cvs.socket cvs.target [email protected] ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cvs.spec ++++++ --- /var/tmp/diff_new_pack.J8RJsJ/_old 2017-06-20 10:59:27.375491847 +0200 +++ /var/tmp/diff_new_pack.J8RJsJ/_new 2017-06-20 10:59:27.387490155 +0200 @@ -1,7 +1,7 @@ # # spec file for package cvs # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,29 +17,23 @@ Name: cvs -BuildRequires: automake -BuildRequires: gdbm-devel -BuildRequires: zlib-devel -Url: http://www.nongnu.org/cvs/ Version: 1.12.12 Release: 0 Summary: Concurrent Versions System -License: GPL-2.0+ and LGPL-2.1+ +License: GPL-2.0+ AND LGPL-2.1+ Group: Development/Tools/Version Control -Requires: /bin/mktemp -Requires: /usr/bin/csh -Source: http://ftp.gnu.org/non-gnu/%name/source/feature/%version/%name-%version.tar.bz2 +Url: http://www.nongnu.org/cvs/ +Source: http://ftp.gnu.org/non-gnu/%{name}/source/feature/%{version}/%{name}-%{version}.tar.bz2 Source1: http://www.does-not-exist.org/roessler/cvslock-0.2.tar.gz -Source2: xinetd.conf Source3: cvs.sh Source4: cvs.csh -# http://cvsbook.red-bean.com/OpenSourceDevWithCVS_2E.tar.gz -Source10: OpenSourceDevWithCVS_2E.tar.bz2 -Patch: cvs.diff +Source5: [email protected] +Source6: cvs.socket +Source7: cvs.target +Source10: http://cvsbook.red-bean.com/OpenSourceDevWithCVS_2E.tar.gz +Patch0: cvs.diff Patch2: diff-k.possible.patch Patch5: cvs-fix_sigpipe_flowcontrol.diff -#Patch6: allow_trailing_dir_slash.diff -#Patch7: use_system_zlib.diff Patch8: cvs-use_vitmp.diff Patch10: cvs-new-sort-option.diff Patch11: cvs-1.11.9-nocsh.patch @@ -58,8 +52,17 @@ Patch27: cvs-fix_printf_format.diff Patch28: cvs-gnulib.diff Patch29: cvs-CVE-2012-0804.patch -PreReq: %install_info_prereq -BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: automake +BuildRequires: gdbm-devel +BuildRequires: groff +BuildRequires: krb5-devel +BuildRequires: openssh +Requires: openssh +BuildRequires: zlib-devel +Requires: %{_bindir}/csh +Requires: /bin/mktemp +Requires(post): %{install_info_prereq} +Requires(preun): %{install_info_prereq} %description CVS is a front-end to the rcs (Revision Control System) included in the @@ -80,10 +83,9 @@ %prep %setup -q -a 1 -a 10 -%patch +%patch0 %patch2 %patch5 -#%patch7 -p1 %patch8 -p1 %patch10 %patch11 -p1 @@ -104,13 +106,11 @@ %patch29 %build -autoreconf -fi -#aclocal -I m4 -#autoconf -export CFLAGS="$RPM_OPT_FLAGS -pipe -D_GNU_SOURCE -std=gnu99" +autoreconf -fvi +export CFLAGS="%{optflags} -pipe -D_GNU_SOURCE -std=gnu99" %configure \ --with-external-zlib \ - --with-editor=/usr/bin/vitmp \ + --with-editor=%{_bindir}/vitmp \ --with-rsh=ssh cd cvslock-* %configure @@ -121,42 +121,56 @@ cd - %install -%makeinstall install-info +%make_install install-info mkdir -p %{buildroot}%{_sysconfdir}/profile.d -install -m 0644 %SOURCE3 %SOURCE4 %{buildroot}%{_sysconfdir}/profile.d +install -m 0644 %{SOURCE3} %{SOURCE4} %{buildroot}%{_sysconfdir}/profile.d # hack to avoid csh in requires -chmod 644 %{buildroot}/usr/share/cvs/contrib/sccs2rcs +chmod 644 %{buildroot}%{_datadir}/cvs/contrib/sccs2rcs mkdir -p %{buildroot}%{_sysconfdir}/xinetd.d -cp -ai $RPM_SOURCE_DIR/xinetd.conf %{buildroot}%{_sysconfdir}/xinetd.d/cvs +install -p -m 644 -D %{SOURCE5} %{buildroot}%{_unitdir}/cvs\@.service +install -p -m 644 -D %{SOURCE6} %{buildroot}%{_unitdir}/cvs.socket +install -p -m 644 -D %{SOURCE7} %{buildroot}%{_unitdir}/cvs.target # # install cvslock # cd cvslock-* -%makeinstall +%make_install cd - # # documentation # -mkdir -p %{buildroot}/%_defaultdocdir/%name/ +mkdir -p %{buildroot}/%{_defaultdocdir}/%{name}/ install -m 0644 */OpenSourceDevWithCVS_2E.pdf \ - %{buildroot}/%_defaultdocdir/%name/ + %{buildroot}/%{_defaultdocdir}/%{name}/ install -m 0644 contrib/rcs2log.1 %{buildroot}/%{_mandir}/man1 %post doc -%install_info --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz -%install_info --info-dir=%{_infodir} %{_infodir}/%{name}client.info.gz +%install_info --info-dir=%{_infodir} %{_infodir}/%{name}.info%{ext_info} +%install_info --info-dir=%{_infodir} %{_infodir}/%{name}client.info%{ext_info} + +%preun doc +%install_info_delete --info-dir=%{_infodir} %{_infodir}/%{name}.info%{ext_info} +%install_info_delete --info-dir=%{_infodir} %{_infodir}/%{name}client.info%{ext_info} + +%pre +%service_add_pre cvs.target cvs.socket + +%post +%service_add_post cvs.target cvs.socket + +%preun +%service_del_preun cvs.target cvs.socket -%postun doc -%install_info_delete --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz -%install_info_delete --info-dir=%{_infodir} %{_infodir}/%{name}client.info.gz +%postun +%service_del_postun cvs.target cvs.socket %files %defattr(-,root,root) %dir %{_datadir}/%{name} %dir %{_datadir}/%{name}/contrib -%config(noreplace) %{_sysconfdir}/xinetd.d/cvs %config(noreplace) %{_sysconfdir}/profile.d/cvs.sh %config(noreplace) %{_sysconfdir}/profile.d/cvs.csh +%{_unitdir}/* %{_bindir}/cvs %{_bindir}/cvsbug %{_bindir}/rcs2log @@ -179,18 +193,18 @@ %{_datadir}/%{name}/contrib/sandbox_status %{_datadir}/%{name}/contrib/validate_repo %attr(755,root,root) %{_datadir}/%{name}/contrib/sccs2rcs -%doc %{_mandir}/man1/*.gz -%doc %{_mandir}/man5/*.gz -%doc %{_mandir}/man8/*.gz +%{_mandir}/man1/*%{ext_man} +%{_mandir}/man5/*%{ext_man} +%{_mandir}/man8/*%{ext_man} %files doc %defattr(-,root,root) -%dir %_defaultdocdir/%name -%doc %_infodir/cvs.info-*.gz -%doc %_infodir/cvs.info.gz -%doc %_infodir/cvsclient.info-*.gz -%doc %_infodir/cvsclient.info.gz +%dir %{_defaultdocdir}/%{name} +%{_infodir}/cvs.info-*%{ext_info} +%{_infodir}/cvs.info%{ext_info} +%{_infodir}/cvsclient.info-*%{ext_info} +%{_infodir}/cvsclient.info%{ext_info} %doc %{_datadir}/%{name}/contrib/intro.doc -%doc %_defaultdocdir/%name/OpenSourceDevWithCVS_2E.pdf +%doc %{_defaultdocdir}/%{name}/OpenSourceDevWithCVS_2E.pdf %changelog ++++++ cvs.socket ++++++ [Unit] Description=CVS Server Activation Socket PartOf=cvs.target [Socket] ListenStream=2401 Accept=true [Install] WantedBy=sockets.target ++++++ cvs.target ++++++ [Unit] Description=CVS Servers ++++++ [email protected] ++++++ [Unit] Description=CVS Server After=local-fs.target PartOf=cvs.target [Service] Environment=HOME=/var/cvs ExecStart=-/usr/bin/cvs -f --allow-root=/var/cvs pserver StandardInput=socket
