- up to 2.4.5

diff --git a/tin-charset.patch b/tin-charset.patch
index b04ebc13b4cab7264d222fb28a57105ed2842152..1c9a310e623595554af7732c6cd5154f239e6e73 100644 (file)
--- a/tin-charset.patch
+++ b/tin-charset.patch
@@ -1,26 +1,20 @@
-diff -urN tin-1.6.1.org/doc/tin.defaults tin-1.6.1/doc/tin.defaults
---- tin-1.6.1.org/doc/tin.defaults     Sat Jul 12 15:49:45 2003
-+++ tin-1.6.1/doc/tin.defaults Mon Aug 18 11:19:31 2003
-@@ -1,3 +1,4 @@
-+# tin configuration file V1.3.7
- #
- # TIN 1.9.4 - a threaded newsreader
- #
-@@ -55,7 +56,12 @@
+--- tin-2.4.5/doc/tin.defaults~        2017-05-03 17:47:32.000000000 +0000
++++ tin-2.4.5/doc/tin.defaults 2021-08-14 07:50:47.703578241 +0000
+@@ -55,7 +55,12 @@
  # idea to set mm_charset here for providing a default
  # in most western countries ISO-8859-1 might be the best value
  #
 -#mm_charset=iso-8859-1
 +mm_charset=ISO-8859-2
 +
-+# harset used for MIME (Content-Type) header in postings.
++# charset used for MIME (Content-Type) header in postings.
 +
 +mm_network_charset=ISO-8859-2
 +
  
  # post_mime_encoding
  #
-@@ -63,7 +69,7 @@
+@@ -63,7 +68,7 @@
  # idea to set post_mime_encoding here for providing a default
  # in most western countries 8bit might be the best value
  #
@@ -29,7 +23,7 @@ diff -urN tin-1.6.1.org/doc/tin.defaults tin-1.6.1/doc/tin.defaults
  
  # mail_mime_encoding
  #
-@@ -144,3 +150,8 @@
+@@ -155,3 +160,8 @@
  # to change this setting if your configuration differs
  #
  #subscriptionsfile=/usr/lib/news/subscriptions

diff --git a/tin-ncurses.patch b/tin-ncurses.patch
deleted file mode 100644 (file)
index 42933ce..0000000
--- a/tin-ncurses.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -urN tin-1.5.9.org/configure tin-1.5.9/configure
---- tin-1.5.9.org/configure    Mon Jul 23 14:31:37 2001
-+++ tin-1.5.9/configure        Wed Jul 25 21:33:46 2001
-@@ -797,6 +797,7 @@
- ALL_LINGUAS="da de en_GB et fr ru sv tr"
- 
- ### Checks for programs
-+CFLAGS="$CFLAGS -I/usr/include/ncurses"
- save_CFLAGS="$CFLAGS"
- # Extract the first word of "gcc", so it can be a program name with args.
- set dummy gcc; ac_word=$2
-diff -urN tin-1.5.9.org/configure.in tin-1.5.9/configure.in
---- tin-1.5.9.org/configure.in Mon Jul 23 14:31:35 2001
-+++ tin-1.5.9/configure.in     Wed Jul 25 21:34:14 2001
-@@ -82,6 +82,7 @@
- ALL_LINGUAS="da de en_GB et fr ru sv tr"
- 
- ### Checks for programs
-+CFLAGS="$CFLAGS -I/usr/include/ncurses"
- save_CFLAGS="$CFLAGS"
- AC_PROG_CC
- AC_PROG_GCC_TRADITIONAL
---- tin-1.9.6/src/Makefile.in~ 2010-01-01 11:08:12.000000000 +0100
-+++ tin-1.9.6/src/Makefile.in  2011-03-04 21:30:48.932221763 +0100
-@@ -73,7 +73,7 @@
- INTL_LIBS     = @INTLLIBS@
- PCRE_LIBS     = @PCREDIR_LIBS@ @PCREDIR_MAKE@ -L../pcre -lpcre
- LIBS          = @LIBS@
--LINK_LIBS     = $(PCRE_LIBS) $(CANLIB) @LIBS@ $(INTL_LIBS)
-+LINK_LIBS     = $(PCRE_LIBS) $(CANLIB) @LIBS@ $(INTL_LIBS) -ltinfo
- 
- # Where do you want the binary & manual page installed?
- DESTDIR       = @DESTDIR@

diff --git a/tin-nostrip.patch b/tin-nostrip.patch
deleted file mode 100644 (file)
index 5de79ba..0000000
--- a/tin-nostrip.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- tin-2.0.1/src/Makefile.in.orig     2021-08-12 15:06:49.834866042 +0200
-+++ tin-2.0.1/src/Makefile.in  2021-08-12 15:09:22.534180247 +0200
-@@ -385,7 +385,7 @@
- install : $(DESTDIR)$(INS_BINARY_DIR)
-       @$(MAKE) all
-       @$(ECHO) "Installing $(EXE) v$(VER) to $(DESTDIR)$(INS_BINARY_DIR)/$(PROJEXE) ..."
--      @$(INSTALL) -s $(BINDIR)/$(EXE) $(DESTDIR)$(INS_BINARY_DIR)/$(PROJEXE)
-+      @$(INSTALL) $(BINDIR)/$(EXE) $(DESTDIR)$(INS_BINARY_DIR)/$(PROJEXE)
-       @( $(CD) $(DESTDIR)$(INS_BINARY_DIR) && $(RM) -f r$(PROJEXE) && $(LN) $(PROJEXE) r$(PROJEXE) )
-       @$(MAKE) install_helpers
-       @$(MAKE) install_manpage

diff --git a/tin-range.patch b/tin-range.patch
deleted file mode 100644 (file)
index 76bd453..0000000
--- a/tin-range.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN tin-1.5.7.org/src/newsrc.c tin-1.5.7/src/newsrc.c
---- tin-1.5.7.org/src/newsrc.c Mon Nov  6 01:47:02 2000
-+++ tin-1.5.7/src/newsrc.c     Mon Nov  6 01:48:04 2000
-@@ -894,7 +894,7 @@
-       struct t_group *group)
- {
-       long artnum;
--      long i;
-+      unsigned long long i;
-       t_bool flag = FALSE;
- 
- #ifdef DEBUG

diff --git a/tin.spec b/tin.spec
index d5d9ddc371760faecbe3415eb096834bd140d430..d45342ccfd09a26d46099b7aeeb434d122d8a346 100644 (file)
--- a/tin.spec
+++ b/tin.spec
@@ -11,20 +11,17 @@ Summary(ru.UTF-8):  tin - программа для чтения телеконф
 Summary(tr.UTF-8):     Haber okuyucu
 Summary(uk.UTF-8):     tin - програма для читання телеконференцій Usenet
 Name:          tin
-Version:       2.0.1
-Release:       14
+Version:       2.4.5
+Release:       1
 Epoch:         5
 License:       distributable
 Group:         Applications/News
 Source0:       ftp://ftp.tin.org/pub/news/clients/tin/stable/%{name}-%{version}.tar.gz
-# Source0-md5: d05622db1712a78a2b92aa27904befc2
+# Source0-md5: 303016b1aa8d845cc79d6bd6754a81a8
 Source1:       %{name}.desktop
 Source2:       %{name}.attributes
 Patch0:                %{name}-enable_coloring.patch
-Patch1:                %{name}-ncurses.patch
-Patch2:                %{name}-range.patch
-Patch3:                %{name}-charset.patch
-Patch4:                %{name}-nostrip.patch
+Patch1:                %{name}-charset.patch
 URL:           http://www.tin.org/
 BuildRequires: bison
 BuildRequires: gettext-tools
@@ -87,9 +84,6 @@ Tin - це проста у використанні повноекранна п
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
 
 %build
 LDFLAGS="%{rpmldflags}"
@@ -120,15 +114,17 @@ install -d $RPM_BUILD_ROOT/{etc,etc/tin,%{_bindir},%{_mandir}/man1,%{_mandir}/ma
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-install doc/tin.defaults $RPM_BUILD_ROOT%{_sysconfdir}/tin/tinrc
-install %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/tin/attributes
+cp -p doc/tin.defaults $RPM_BUILD_ROOT%{_sysconfdir}/tin/tinrc
+cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/tin/attributes
 %{__rm} $RPM_BUILD_ROOT%{_mandir}/man1/rtin.1
 echo ".so tin.1" > $RPM_BUILD_ROOT%{_mandir}/man1/rtin.1
 
-install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
+cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
 
 # file conflict mmdf between mutt and tin
 %{__rm} $RPM_BUILD_ROOT%{_mandir}/man5/mmdf.5*
+# file conflict mbox between manpages and tin
+%{__rm} $RPM_BUILD_ROOT%{_mandir}/man5/mbox.5*
 
 %find_lang %{name}
 
@@ -155,4 +151,5 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/url_handler.pl.1*
 %{_mandir}/man1/w2r.pl.1*
 %{_mandir}/man5/tin.5*
+%{_mandir}/man5/rtin.5*
 %{_desktopdir}/tin.desktop