Hello community, here is the log from the commit of package fetchmail for openSUSE:Factory checked in at 2015-01-09 20:50:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/fetchmail (Old) and /work/SRC/openSUSE:Factory/.fetchmail.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "fetchmail" Changes: -------- --- /work/SRC/openSUSE:Factory/fetchmail/fetchmail.changes 2014-12-16 14:48:15.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.fetchmail.new/fetchmail.changes 2015-01-09 20:50:29.000000000 +0100 @@ -1,0 +2,13 @@ +Thu Jan 8 16:04:11 UTC 2015 - tchva...@suse.com + +- Cleanup with spec-cleaner +- Remove support for <12.3 as it does not build anyway. +- Fix krb5 switches +- Provide proper rcbla controler for the service + +------------------------------------------------------------------- +Mon Dec 29 13:46:10 UTC 2014 - meiss...@suse.com + +- build with PIE + +------------------------------------------------------------------- Old: ---- fetchmail.init fetchmail.xpm ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fetchmail.spec ++++++ --- /var/tmp/diff_new_pack.b29he8/_old 2015-01-09 20:50:30.000000000 +0100 +++ /var/tmp/diff_new_pack.b29he8/_new 2015-01-09 20:50:30.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package fetchmail # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 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 @@ -17,25 +17,13 @@ Name: fetchmail -BuildRequires: automake -BuildRequires: krb5-devel -BuildRequires: openssl-devel -BuildRequires: opie -BuildRequires: postfix -BuildRequires: procmail -BuildRequires: pwdutils -BuildRequires: python-devel Version: 6.3.26 Release: 0 Summary: Full-Featured POP and IMAP Mail Retrieval Daemon License: GPL-2.0+ Group: Productivity/Networking/Email/Utilities Url: http://www.fetchmail.info/ -# The fetchmail-{EN,SA}-*.txt security advisories -# were relicensed to CC BY-ND 3.0, so there's no need -# to repack the tarball without them anymore (bnc#713698) Source: http://sourceforge.net/projects/fetchmail/files/branch_6.3/%{name}-%{version}.tar.xz -Source1: %{name}.init Source2: %{name}.logrotate Source3: sysconfig.%{name} Source4: http://sourceforge.net/projects/fetchmail/files/branch_6.3/%{name}-%{version}.tar.xz.asc @@ -43,20 +31,23 @@ Source6: %{name}.service Source7: %{name}.tmpfiles Patch0: fetchmail-6.3.8-smtp_errors.patch -%if 0%{?suse_version} >=1230 -BuildRequires: pkgconfig(systemd) -%{?systemd_requires} -%else -Requires(pre): %insserv_prereq -%endif +BuildRequires: automake +BuildRequires: krb5-devel +BuildRequires: openssl-devel +BuildRequires: opie +BuildRequires: postfix +BuildRequires: procmail +BuildRequires: pwdutils +BuildRequires: python-devel +BuildRequires: xz +Requires: logrotate Requires(pre): %fillup_prereq Requires(pre): coreutils Requires(pre): pwdutils -BuildRequires: xz -Requires: logrotate Suggests: smtp_daemon BuildRoot: %{_tmppath}/%{name}-%{version}-build -Icon: fetchmail.xpm +BuildRequires: pkgconfig(systemd) +%{?systemd_requires} %description Fetchmail is a robust and well-documented remote mail retrieval and @@ -81,31 +72,24 @@ files (.fetchmailrc). %prep -%setup -q -n %{name}-%{version} +%setup -q %patch0 -p1 -cp -a %{SOURCE1} %{SOURCE2} %{SOURCE3} . +cp -a %{SOURCE2} %{SOURCE3} . + +ACLOCAL="aclocal -I m4 -I m4-local" autoreconf -fvi %build -%if 0%{?suse_version} > 1010 -ACLOCAL="aclocal -I m4 -I m4-local" autoreconf -f -i -%endif -if [ -f /usr/%{_lib}/libkrb5.so ] ; then - GSS="--with-gssapi" -else - GSS="" -fi -%configure\ - --enable-POP2\ - --enable-RPA\ - --enable-NTLM\ - --enable-SDPS\ - --enable-opie\ -%if 0%{?with_krb5} - --with-kerberos5\ - $GSS\ -%endif +export CFLAGS="%{optflags} -fPIE" +%configure \ + --enable-POP2 \ + --enable-RPA \ + --enable-NTLM \ + --enable-SDPS \ + --enable-opie \ + --with-kerberos5 \ + --with-gssapi \ --with-ssl=/usr -make %{?_smp_mflags} +make %{?_smp_mflags} LDFLAGS="-pie" %install %make_install @@ -113,17 +97,12 @@ mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d cp fetchmail.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/fetchmail mkdir -p %{buildroot}/sbin -%if 0%{?suse_version} >=1230 -mkdir -p $RPM_BUILD_ROOT/%{_unitdir} -mkdir -p $RPM_BUILD_ROOT/%{_libexecdir}/tmpfiles.d -install -m 0644 %{S:6} $RPM_BUILD_ROOT/%{_unitdir}/%{name}.service -install -m 0644 %{S:7} $RPM_BUILD_ROOT/%{_libexecdir}/tmpfiles.d/%{name}.conf -%else -mkdir -p %{buildroot}%{_sysconfdir}/init.d -cp fetchmail.init %{buildroot}%{_initddir}/fetchmail -chmod +x %{buildroot}%{_initddir}/fetchmail -ln -s ../etc/init.d/fetchmail %{buildroot}/sbin/rcfetchmail -%endif +mkdir -p %{buildroot}/%{_unitdir} +mkdir -p %{buildroot}/%{_libexecdir}/tmpfiles.d +install -m 0644 %{SOURCE6} %{buildroot}/%{_unitdir}/%{name}.service +install -m 0644 %{SOURCE7} %{buildroot}/%{_libexecdir}/tmpfiles.d/%{name}.conf +mkdir -p %{buildroot}%{_sbindir} +ln -s service %{buildroot}%{_sbindir}/rc%{name} touch %{buildroot}%{_sysconfdir}/fetchmailrc mkdir -p %{buildroot}%{_localstatedir}/adm/fillup-templates cp sysconfig.%{name} %{buildroot}%{_localstatedir}/adm/fillup-templates @@ -137,34 +116,22 @@ %pre usr/sbin/useradd -r -g daemon -s /bin/false \ - -c "mail retrieval daemon" -d /var/lib/fetchmail fetchmail 2>/dev/null || : -%if 0%{?suse_version} >=1230 + -c "mail retrieval daemon" -d %{_localstatedir}/lib/fetchmail fetchmail 2>/dev/null || : %service_add_pre %{name}.service -%endif %post -%if 0%{?suse_version} >=1230 -%{fillup_only} +%fillup_only %service_add_post %{name}.service -%else -%{fillup_and_insserv} -%endif # Ensure that all files are readable by fetchmail with non-root UID. touch var/log/fetchmail chown fetchmail var/log/fetchmail chmod 0600 var/log/fetchmail %preun -%if 0%{?suse_version} >=1230 - %service_del_preun %{name}.service -%endif +%service_del_preun %{name}.service %postun -%if 0%{?suse_version} >=1230 %service_del_postun %{name}.service -%else -%{insserv_cleanup} -%endif if [ $1 = 0 ]; then rm -rf var/lib/fetchmail fi @@ -178,13 +145,9 @@ %doc COPYING FAQ FEATURES NEWS NOTES OLDNEWS README README.NTLM README.SSL README.SSL-SERVER TODO contrib *.html *.txt *.pdf %ghost %config(noreplace) %attr(0600, fetchmail, root) %{_sysconfdir}/fetchmailrc %config(noreplace) %{_sysconfdir}/logrotate.d/fetchmail -%if 0%{?suse_version} >=1230 %{_unitdir}/%{name}.service +%{_sbindir}/rc%{name} %{_libexecdir}/tmpfiles.d/%{name}.conf -%else -%{_sysconfdir}/init.d/fetchmail -/sbin/rcfetchmail -%endif %{_localstatedir}/adm/fillup-templates/sysconfig.%{name} %files -n fetchmailconf -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
