Hello community, here is the log from the commit of package slrn for openSUSE:Factory checked in at 2012-05-08 12:29:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/slrn (Old) and /work/SRC/openSUSE:Factory/.slrn.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "slrn", Maintainer is "nadvor...@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/slrn/slrn.changes 2011-12-25 17:41:52.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.slrn.new/slrn.changes 2012-05-08 12:29:06.000000000 +0200 @@ -1,0 +2,27 @@ +Sun May 6 10:36:49 UTC 2012 - ch...@computersalat.de + +- update to version pre1.0.0-40 + * Parse mime sub-keywords without regard to case + +------------------------------------------------------------------- +Mon Apr 9 18:13:38 UTC 2012 - g...@opensuse.org + +- update to version pre1.0.0~39 + - bugfixes + - support for multipart mime messages +- compile without -fno-strict-aliasing +- enable SSL support via GnuTLS which seems to work on + openSUSE > 12.1 +- drop superfluous patch slrn-0.9.9p1.diff +- drop slrn-0.9.9p1-hardcode-inews-path.diff and add a build + dependency on mininews instead, this also makes + slrn-0.9.9p1-configure.diff unecessary +- rebased slrn-0.9.9p1-do-not-strip-binaries.diff and renamed to + slrn-do-not-strip-binaries.patch +- removed slrn.run, there is no SUSE menu any more +- removed obsolete slrn.rc migration pre-script +- replace __DATE__ and __TIME__ with date/time of latest changelog + entry +- do not replace slrn.rc + +------------------------------------------------------------------- Old: ---- slrn-0.9.9p1-configure.diff slrn-0.9.9p1-do-not-strip-binaries.diff slrn-0.9.9p1-hardcode-inews-path.diff slrn-0.9.9p1.diff slrn-pre1.0.0~18.tar.bz2 slrn.run New: ---- slrn-do-not-strip-binaries.patch slrn-pre1.0.0-40.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ slrn.spec ++++++ --- /var/tmp/diff_new_pack.KuW8IV/_old 2012-05-08 12:29:07.000000000 +0200 +++ /var/tmp/diff_new_pack.KuW8IV/_new 2012-05-08 12:29:07.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package slrn # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -15,102 +15,100 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -%define build_with_nss 0 + +%define upstream_version pre1.0.0-40 Name: slrn -Version: 1.0pre18 +Version: 1.0pre40 Release: 0 -Summary: News Reader +Summary: Powerful, Threaded Newsreader License: GPL-2.0+ Group: Productivity/Networking/News/Clients Url: http://www.slrn.org -Source: slrn-pre1.0.0~18.tar.bz2 -Source1: slrn.run -Patch0: slrn-0.9.9p1.diff -Patch2: slrn-0.9.9p1-configure.diff -Patch4: slrn-0.9.9p1-hardcode-inews-path.diff -Patch5: slrn-0.9.9p1-do-not-strip-binaries.diff -%if 0%{?build_with_nss} > 0 -BuildRequires: mozilla-nss-devel -BuildRequires: nss-compat-openssl-devel -%endif -BuildRequires: autoconf -BuildRequires: slang-devel -Requires(pre): fileutils sh-utils coreutils +## commented, cause previous files got deleted when new files are added +## hey, he call them snapshot versions +#Source: http://www.jedsoft.org/snapshots/slrn-%{upstream_version}.tar.gz +Source: slrn-%{upstream_version}.tar.gz +# PATCH-FIX-OPENSUSE slrn-do-not-strip-binaries.diff g...@opensuse.org -- Prevents binaris from being stripped +Patch0: slrn-do-not-strip-binaries.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: ed +BuildRequires: mininews +BuildRequires: slang-devel +# SSL support via GnuTLS does not work on openSUSE <= 12.1 +%if 0%{?suse_version} > 1210 +BuildRequires: gnutls-devel +BuildRequires: libgcrypt-devel +BuildRequires: libgnutls-openssl-devel +%endif +Recommends: %{name}-lang = %{version} %description -SLRN is a powerful, easy to use, and threaded Internet newsreader. It +slrn is a powerful, easy to use, and threaded Internet newsreader. It is highly customizable, permitting redefinition of keys and including a sophisticated macro language for further customization. - - -Authors: --------- - John Davis <da...@space.mit.edu> - - %lang_package + %prep -%setup -q -n %name -%patch0 -%patch2 -%patch4 -%patch5 +%setup -q -n %{name}-%{upstream_version} +%patch0 -p1 + # correct path to sendmail -%__sed -i'' 's|/usr/lib/sendmail|/usr/sbin/sendmail|g' src/slrnfeat.hin -# regenerate configuration script from patched template -autoconf --verbose --include=autoconf --output=configure autoconf/configure.ac +ed -s src/slrnfeat.hin 2>/dev/null <<'EOF' +,s/\/usr\/lib\/sendmail/\/usr\/sbin\/sendmail/ +EOF + +# replace __DATE__ and __TIME__ with date/time of the last specfile changelog +# entry +modified="$(sed -n '/^----/n;s/ - .*$//;p;q' "%{_sourcedir}/%{name}.changes")" +DATE="\"$(date -d "${modified}" "+%%b %%e %%Y")\"" +TIME="\"$(date -d "${modified}" "+%%R")\"" +find . -name '*.[ch]' -print -exec sh -c ' + sed "/^[ \t]*#[ \t]*if/n;s/__DATE__/$3/g;s/__TIME__/$2/g" "$1" >"$1.new" && \ + mv "$1.new" "$1" +' {} {} "${TIME}" "${DATE}" \; %build -export CFLAGS="%optflags -fno-strict-aliasing" %configure \ - --with-docdir=%{_defaultdocdir}/slrn \ --with-slrnpull \ -%if 0%{?build_with_nss} > 0 - --with-ssl=%{_prefix} \ - --with-nss-compat \ -%endif --enable-inews \ +%if 0%{?suse_version} > 1210 + --with-gnutls=%{_prefix} \ +%endif --disable-rpath make %install -%makeinstall -install -m 755 -d "%{buildroot}/etc/slrn" -install -m 644 doc/slrn.rc "%{buildroot}/etc/slrn/" -install %{S:1} "%{buildroot}/usr/bin/" +%make_install +install -m 644 -D doc/slrn.rc %{buildroot}%{_sysconfdir}/slrn/slrn.rc + +# remove installed documentation, packaged manually below +rm -rf %{buildroot}%{_datadir}/doc + %find_lang %{name} -%pre -test -e usr/lib/slrn/slrn.rc && { - mkdir -p etc/slrn - test -e etc/slrn/slrn.rc || \ - mv usr/lib/slrn/slrn.rc etc/slrn/slrn.rc -} -test -e var/lib/slrn/slrn.rc && { - mkdir -p etc/slrn - test -e etc/slrn/slrn.rc || \ - mv var/lib/slrn/slrn.rc etc/slrn/slrn.rc -} -exit 0 +# make contrib scripts non-executable +find contrib/ doc -type f -exec chmod 644 {} + + +%clean +rm -rf "%{buildroot}" %files %defattr(-,root,root) -%docdir %{_defaultdocdir}/slrn -%{_defaultdocdir}/slrn -%dir /etc/slrn -/usr/bin/slrn -/usr/bin/slrn.run -/usr/bin/slrnpull -%config /etc/slrn/slrn.rc -%doc %{_mandir}/man1/* -/usr/share/slrn +%doc changes.txt COPYING COPYRIGHT README +%doc doc/{FAQ,FIRST_STEPS,help.txt,manual.txt,pc-keys.txt,README.GroupLens} +%doc doc/{README.macros,README.multiuser,README.SSL,score.txt,slrn-doc.html} +%doc doc/{slrnfuns.txt,slrn.rc,THANKS,*.sl} +%doc doc/slrnpull/ contrib/ +%dir %{_sysconfdir}/slrn +%config(noreplace) %{_sysconfdir}/slrn/slrn.rc +%{_bindir}/slrn +%{_bindir}/slrnpull +%doc %{_mandir}/man1/slrn.1* +%doc %{_mandir}/man1/slrnpull.1* +%{_datadir}/slrn %files lang -f %{name}.lang -%clean -rm -rf "%{buildroot}" - %changelog ++++++ slrn-do-not-strip-binaries.patch ++++++ diff -ur slrn-pre1.0.0-39.orig/src/Makefile.in slrn-pre1.0.0-39/src/Makefile.in --- slrn-pre1.0.0-39.orig/src/Makefile.in 2010-10-03 05:31:26.000000000 +0200 +++ slrn-pre1.0.0-39/src/Makefile.in 2012-04-10 16:59:35.602624416 +0200 @@ -206,8 +206,8 @@ installlocales: cd ../po; $(MAKE) DESTDIR=$(DESTDIR) LOCALEDIR=$(LOCALEDIR) install installbin: - $(INSTALL) -m 755 -s $(OBJDIR)/slrn $(DEST_BINDIR) - -$(INSTALL) -m 755 -s $(OBJDIR)/slrnpull $(DEST_BINDIR) + $(INSTALL) -m 755 $(OBJDIR)/slrn $(DEST_BINDIR) + -$(INSTALL) -m 755 $(OBJDIR)/slrnpull $(DEST_BINDIR) install: all installdirs installbin installdocs installslang installlocales # The symlinks target is for my own private use. It simply creates the object -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
