[slrn/f19] 1.0.2 bump

[Petr Pisar]

commit 9038b178edf7010b46eeb4278048b08c16043fcf
Author: Petr Písař <ppisar at redhat.com>
Date:   Thu Dec 11 09:56:30 2014 +0100

    1.0.2 bump

 .gitignore                             |    1 +
 slrn-0.9.9pre108-makefile.patch        |   23 -----------------------
 slrn-1.0.2-Do-not-strip-binaries.patch |   31 +++++++++++++++++++++++++++++++
 slrn.spec                              |   29 ++++++++++++++++++++---------
 sources                                |    2 +-
 5 files changed, 53 insertions(+), 33 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index fcdd8ea..4b38299 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 slrn-0.9.9p1.tar.gz
 /slrn-1.0.1.tar.gz
+/slrn-1.0.2.tar.bz2
diff --git a/slrn-1.0.2-Do-not-strip-binaries.patch b/slrn-1.0.2-Do-not-strip-binaries.patch
new file mode 100644
index 0000000..8393be3
--- /dev/null
+++ b/slrn-1.0.2-Do-not-strip-binaries.patch
@@ -0,0 +1,31 @@
+From b6411e6464ccdd6f45a10b60792e181b00a514b7 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar at redhat.com>
+Date: Thu, 11 Dec 2014 09:33:20 +0100
+Subject: [PATCH] Do not strip binaries
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Petr Písař <ppisar at redhat.com>
+---
+ src/Makefile.in | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/Makefile.in b/src/Makefile.in
+index 0159e4a..9129636 100644
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -207,8 +207,8 @@ installslang:
+ 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
+-- 
+1.9.3
+
diff --git a/slrn.spec b/slrn.spec
index 369ace1..213a4af 100644
--- a/slrn.spec
+++ b/slrn.spec
@@ -1,20 +1,21 @@
 Summary: A threaded Internet news reader
 Name: slrn
-Version: 1.0.1
-Release: 3%{?dist}
+Version: 1.0.2
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/Internet
 URL: http://slrn.sourceforge.net/
-Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+Source0: http://jedsoft.org/releases/%{name}/%{name}-%{version}.tar.bz2
 Source1: slrnpull-expire
 Source2: slrnpull.log
 Source4: README.rpm-slrnpull
-Patch1: slrn-0.9.9pre108-makefile.patch
+# Do not strip binaries by make install
+Patch1: slrn-1.0.2-Do-not-strip-binaries.patch
 Patch2: slrn-0.9.9pre108-sendmail.patch
 BuildRequires: inews
 BuildRequires: nss-devel
 BuildRequires: nss_compat_ossl-devel
-BuildRequires: slang-devel >= 2.1
+BuildRequires: slang-devel >= 2.2.3
 # Some s-lang scripts (smime.sl) use slsh interpreter
 Requires:      slang-slsh
 Requires(pre): shadow-utils
@@ -38,20 +39,29 @@ the slrnpull utility.
 
 %prep
 %setup -q
-%patch1 -p1 -b .makefile
+%patch1 -p1 -b .nostrip
 %patch2 -p1 -b .sendmail
 
 for i in changes.txt; do
   iconv -f iso8859-1 -t utf8 -o ${i}{_,} && touch -r ${i}{,_} && mv -f ${i}{_,}
 done
 
+chmod 644 doc/slrnpull/* contrib/*
+
 %build
 %configure \
     --with-ssl=%{_prefix} \
     --with-nss-compat \
     --with-slrnpull=%{_var}/spool/slrnpull \
+    --without-x \
+    --enable-charmap \
+    --enable-emph-text \
     --enable-inews \
+    --enable-nls \
+    --enable-nntp \
+    --disable-rpath \
     --enable-setgid-code \
+    --enable-spoilers \
     --enable-warnings
 make %{?_smp_mflags}
 
@@ -68,8 +78,6 @@ install -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/cron.daily
 install -p -m644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/slrn-pull
 install -p -m644 %{SOURCE4} doc/slrnpull/README.rpm
 
-chmod 644 doc/slrnpull/* contrib/*
-
 %find_lang %{name}
 
 # remove unpackaged files from the buildroot
@@ -83,7 +91,7 @@ getent passwd news >/dev/null || \
 exit 0
 
 %files -f %{name}.lang
-%doc COPYING COPYRIGHT changes.txt README
+%doc COPYING COPYRIGHT changes.txt NEWS README
 %doc doc/FAQ doc/FIRST_STEPS doc/README.* doc/THANKS doc/*.txt doc/slrn*.html
 %doc doc/score.sl contrib
 %{_bindir}/slrn
@@ -102,6 +110,9 @@ exit 0
 %{_mandir}/man1/slrnpull.1*
 
 %changelog
+* Thu Dec 11 2014 Petr Pisar <ppisar at redhat.com> - 1.0.2-1
+- 1.0.2 bump
+
 * Tue Mar 05 2013 Petr Pisar <ppisar at redhat.com> - 1.0.1-3
 - Require slang-slsh
 
diff --git a/sources b/sources
index 00dc4b7..7c1958f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-232670ab76a045967b137e5124b3d681  slrn-1.0.1.tar.gz
+4962fc3311023c7a343919ae6fb440e7  slrn-1.0.2.tar.bz2