[packages/slrn] - rediff patches - unbreak debuginfo packages by not stripping on install - rel 2
baggins
baggins at pld-linux.org
Sun Oct 3 23:10:24 CEST 2021
commit 33957255b1dfb3bf5aa313bc6d963648677ba154
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Sun Oct 3 23:09:42 2021 +0200
- rediff patches
- unbreak debuginfo packages by not stripping on install
- rel 2
no-strip.patch | 13 ++++++++++++
slrn-keymap.patch | 36 +++++++++++++++----------------
slrn-sort_visible_headers.patch | 41 +++++++++++++++++------------------
slrn-user-agent.patch | 47 ++++++++++++++++++++++-------------------
slrn.spec | 4 +++-
5 files changed, 80 insertions(+), 61 deletions(-)
---
diff --git a/slrn.spec b/slrn.spec
index 3bae73f..bfcf7cb 100644
--- a/slrn.spec
+++ b/slrn.spec
@@ -14,7 +14,7 @@ Summary(pt_BR.UTF-8): O melhor leitor de notícias do mundo
Summary(tr.UTF-8): Görüşüne göre dünyanın en iyi haber grubu okuyucusu
Name: slrn
Version: 1.0.3a
-Release: 1
+Release: 2
License: GPL v2+
Group: Applications/News
Source0: http://jedsoft.org/releases/slrn/%{name}-%{version}.tar.bz2
@@ -28,6 +28,7 @@ Patch1: %{name}-user-agent.patch
Patch2: %{name}-sort_visible_headers.patch
Patch3: %{name}-home_etc.patch
Patch4: %{name}-pl.po-update.patch
+Patch5: no-strip.patch
#URL: http://www.slrn.org/ is outdated / faked (hidden advertisements...)
URL: http://jedsoft.org/releases/slrn/
BuildRequires: autoconf >= 2.50
@@ -120,6 +121,7 @@ spool de notícias, para leitura "offline".
%patch2 -p1
%patch3 -p1
%patch4 -p1
+%patch5 -p1
ln -s autoconf/configure.ac .
diff --git a/no-strip.patch b/no-strip.patch
new file mode 100644
index 0000000..2078932
--- /dev/null
+++ b/no-strip.patch
@@ -0,0 +1,13 @@
+--- slrn-1.0.3/src/Makefile.in~ 2016-10-24 00:34:16.000000000 +0200
++++ slrn-1.0.3/src/Makefile.in 2021-10-03 23:08:14.731387624 +0200
+@@ -207,8 +207,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
diff --git a/slrn-keymap.patch b/slrn-keymap.patch
index 5ded1c4..02cbc05 100644
--- a/slrn-keymap.patch
+++ b/slrn-keymap.patch
@@ -1,7 +1,7 @@
-diff -Nur slrn-0.9.8.0.orig/src/art.c slrn-0.9.8.0/src/art.c
---- slrn-0.9.8.0.orig/src/art.c 2003-08-25 16:59:16.000000000 +0200
-+++ slrn-0.9.8.0/src/art.c 2003-08-26 20:21:55.098452392 +0200
-@@ -7263,20 +7263,28 @@
+diff -urNp -x '*.orig' slrn-1.0.3.org/src/art.c slrn-1.0.3/src/art.c
+--- slrn-1.0.3.org/src/art.c 2016-10-24 00:34:16.000000000 +0200
++++ slrn-1.0.3/src/art.c 2021-10-03 22:48:58.844392038 +0200
+@@ -7672,20 +7672,28 @@ void slrn_init_article_mode (void) /*{{{
#else
SLkm_define_key ("\033\033[A", (FVOID_STAR) art_lineup, Slrn_Article_Keymap);
SLkm_define_key ("\033\033OA", (FVOID_STAR) art_lineup, Slrn_Article_Keymap);
@@ -30,7 +30,7 @@ diff -Nur slrn-0.9.8.0.orig/src/art.c slrn-0.9.8.0/src/art.c
#endif
SLkm_define_key ("^U", (FVOID_STAR) header_pageup, Slrn_Article_Keymap);
SLkm_define_key ("\033V", (FVOID_STAR) header_pageup, Slrn_Article_Keymap);
-@@ -7286,10 +7294,8 @@
+@@ -7695,10 +7703,8 @@ void slrn_init_article_mode (void) /*{{{
SLkm_define_key ("^@Q", (FVOID_STAR) header_pagedn, Slrn_Article_Keymap);
SLkm_define_key ("\xE0Q", (FVOID_STAR) header_pagedn, Slrn_Article_Keymap);
#else
@@ -43,10 +43,10 @@ diff -Nur slrn-0.9.8.0.orig/src/art.c slrn-0.9.8.0/src/art.c
#endif
SLkm_define_key ("^D", (FVOID_STAR) header_pagedn, Slrn_Article_Keymap);
SLkm_define_key ("^V", (FVOID_STAR) header_pagedn, Slrn_Article_Keymap);
-diff -Nur slrn-0.9.8.0.orig/src/group.c slrn-0.9.8.0/src/group.c
---- slrn-0.9.8.0.orig/src/group.c 2003-08-25 16:47:09.000000000 +0200
-+++ slrn-0.9.8.0/src/group.c 2003-08-26 20:21:55.110450568 +0200
-@@ -1992,8 +1992,10 @@
+diff -urNp -x '*.orig' slrn-1.0.3.org/src/group.c slrn-1.0.3/src/group.c
+--- slrn-1.0.3.org/src/group.c 2016-10-24 00:34:16.000000000 +0200
++++ slrn-1.0.3/src/group.c 2021-10-03 22:48:58.844392038 +0200
+@@ -2027,8 +2027,10 @@ void slrn_init_group_mode (void) /*{{{*/
SLkm_define_key ("\0330", (FVOID_STAR) slrn_digit_arg, Slrn_Group_Keymap);
SLkm_define_key ("^K\033[A", (FVOID_STAR) group_bob, Slrn_Group_Keymap);
SLkm_define_key ("^K\033OA", (FVOID_STAR) group_bob, Slrn_Group_Keymap);
@@ -57,9 +57,9 @@ diff -Nur slrn-0.9.8.0.orig/src/group.c slrn-0.9.8.0/src/group.c
SLkm_define_key ("\033a", (FVOID_STAR) toggle_group_formats, Slrn_Group_Keymap);
SLkm_define_key ("\033>", (FVOID_STAR) group_eob, Slrn_Group_Keymap);
SLkm_define_key ("\033<", (FVOID_STAR) group_bob, Slrn_Group_Keymap);
-@@ -2005,10 +2007,8 @@
+@@ -2040,10 +2042,8 @@ void slrn_init_group_mode (void) /*{{{*/
SLkm_define_key ("^@I", (FVOID_STAR) group_pageup, Slrn_Group_Keymap);
- SLkm_define_key ("\xE0I", (FVOID_STAR) group_pageup, Slrn_Group_Keymap);
+ SLkm_define_key ("\xE0I", (FVOID_STAR) group_pageup, Slrn_Group_Keymap);
#else
- SLkm_define_key ("\033[6~", (FVOID_STAR) group_pagedown, Slrn_Group_Keymap);
- SLkm_define_key ("\033[G", (FVOID_STAR) group_pagedown, Slrn_Group_Keymap);
@@ -70,7 +70,7 @@ diff -Nur slrn-0.9.8.0.orig/src/group.c slrn-0.9.8.0/src/group.c
#endif
SLkm_define_key ("m", (FVOID_STAR) move_group_cmd, Slrn_Group_Keymap);
SLkm_define_key ("^U", (FVOID_STAR) group_pageup, Slrn_Group_Keymap);
-@@ -2043,8 +2043,10 @@
+@@ -2078,8 +2078,10 @@ void slrn_init_group_mode (void) /*{{{*/
#else
SLkm_define_key ("\033[A", (FVOID_STAR) group_up, Slrn_Group_Keymap);
SLkm_define_key ("\033OA", (FVOID_STAR) group_up, Slrn_Group_Keymap);
@@ -81,10 +81,10 @@ diff -Nur slrn-0.9.8.0.orig/src/group.c slrn-0.9.8.0/src/group.c
#endif
SLkm_define_key ("N", (FVOID_STAR) group_down, Slrn_Group_Keymap);
SLkm_define_key ("^N", (FVOID_STAR) group_down, Slrn_Group_Keymap);
-diff -Nur slrn-0.9.8.0.orig/src/menu.c slrn-0.9.8.0/src/menu.c
---- slrn-0.9.8.0.orig/src/menu.c 2002-06-26 18:57:34.000000000 +0200
-+++ slrn-0.9.8.0/src/menu.c 2003-08-26 20:21:55.118449352 +0200
-@@ -748,16 +748,14 @@
+diff -urNp -x '*.orig' slrn-1.0.3.org/src/menu.c slrn-1.0.3/src/menu.c
+--- slrn-1.0.3.org/src/menu.c 2016-10-24 00:34:16.000000000 +0200
++++ slrn-1.0.3/src/menu.c 2021-10-03 22:48:58.844392038 +0200
+@@ -783,16 +783,14 @@ static int init_select_list_mode (int se
SLkm_define_key ("^@Q", (FVOID_STAR) sl_pagedn, *kmap);
SLkm_define_key ("\xE0Q", (FVOID_STAR) sl_pagedn, *kmap);
#else
@@ -102,9 +102,9 @@ diff -Nur slrn-0.9.8.0.orig/src/menu.c slrn-0.9.8.0/src/menu.c
- SLkm_define_key ("^(ku)", (FVOID_STAR) sl_up, *kmap);
-# endif
#endif
-
+
/* In select lists, these bindings collide with the new "jump" feature */
-@@ -774,12 +772,10 @@
+@@ -809,12 +807,10 @@ static int init_select_list_mode (int se
#else
SLkm_define_key ("\033[C", (FVOID_STAR) sl_right, Select_List_Keymap);
SLkm_define_key ("\033OC", (FVOID_STAR) sl_right, Select_List_Keymap);
diff --git a/slrn-sort_visible_headers.patch b/slrn-sort_visible_headers.patch
index 7b65d2f..cac0a50 100644
--- a/slrn-sort_visible_headers.patch
+++ b/slrn-sort_visible_headers.patch
@@ -1,7 +1,7 @@
-diff -ur slrn-0.9.7.3.orig/doc/slrn.rc slrn-0.9.7.3/doc/slrn.rc
---- slrn-0.9.7.3.orig/doc/slrn.rc Sat Nov 3 16:13:26 2001
-+++ slrn-0.9.7.3/doc/slrn.rc Sat Jan 12 01:37:32 2002
-@@ -220,6 +220,11 @@
+diff -urNp -x '*.orig' slrn-1.0.3.org/doc/slrn.rc slrn-1.0.3/doc/slrn.rc
+--- slrn-1.0.3.org/doc/slrn.rc 2016-10-24 00:34:16.000000000 +0200
++++ slrn-1.0.3/doc/slrn.rc 2021-10-03 22:48:59.521057945 +0200
+@@ -219,6 +219,11 @@
% display all the "X-"headers except "X-Trace:").
%visible_headers "From:,Subject:,Newsgroups:,Followup-To:,Reply-To:"
@@ -11,23 +11,23 @@ diff -ur slrn-0.9.7.3.orig/doc/slrn.rc slrn-0.9.7.3/doc/slrn.rc
+%set visible_headers_sorting_method 2
+
% If non-zero, #v+ and #v- will be interpreted as markers of verbatim lines.
- %set process_verbatim_marks 1
+ %set process_verbatim_marks 1
-diff -ur slrn-0.9.7.3.orig/src/art.h slrn-0.9.7.3/src/art.h
---- slrn-0.9.7.3.orig/src/art.h Sat Nov 3 16:15:54 2001
-+++ slrn-0.9.7.3/src/art.h Sat Jan 12 01:35:07 2002
-@@ -47,6 +47,7 @@
+diff -urNp -x '*.orig' slrn-1.0.3.org/src/art.h slrn-1.0.3/src/art.h
+--- slrn-1.0.3.org/src/art.h 2016-10-24 00:34:16.000000000 +0200
++++ slrn-1.0.3/src/art.h 2021-10-03 22:48:59.521057945 +0200
+@@ -46,6 +46,7 @@ extern int Slrn_Query_Next_Group;
extern int Slrn_Auto_CC_To_Poster;
extern int Slrn_Score_After_XOver;
extern int Slrn_Use_Tmpdir;
+extern int Slrn_Visible_Headers_Sorting_Mode;
extern int Slrn_Wrap_Mode;
+ extern int Slrn_Wrap_Width;
extern int Slrn_Wrap_Method;
- extern int Slrn_Use_Header_Numbers;
-diff -ur slrn-0.9.7.3.orig/src/art_misc.c slrn-0.9.7.3/src/art_misc.c
---- slrn-0.9.7.3.orig/src/art_misc.c Sat Nov 3 16:15:53 2001
-+++ slrn-0.9.7.3/src/art_misc.c Sat Jan 12 01:35:07 2002
-@@ -65,6 +65,8 @@
+diff -urNp -x '*.orig' slrn-1.0.3.org/src/art_misc.c slrn-1.0.3/src/art_misc.c
+--- slrn-1.0.3.org/src/art_misc.c 2016-10-24 00:34:16.000000000 +0200
++++ slrn-1.0.3/src/art_misc.c 2021-10-03 22:48:59.524391275 +0200
+@@ -65,6 +65,8 @@ int Slrn_Wrap_Width = -1;
static char *Super_Cite_Regexp = "^[^A-Za-z0-9]*\"\\([-_a-zA-Z/]+\\)\" == .+";
@@ -36,7 +36,7 @@ diff -ur slrn-0.9.7.3.orig/src/art_misc.c slrn-0.9.7.3/src/art_misc.c
static void hide_article_lines (Slrn_Article_Type *a, unsigned int mask) /*{{{*/
{
Slrn_Article_Line_Type *l;
-@@ -908,6 +910,157 @@
+@@ -935,6 +937,157 @@ void _slrn_art_unhide_headers (Slrn_Arti
/*}}}*/
@@ -194,8 +194,8 @@ diff -ur slrn-0.9.7.3.orig/src/art_misc.c slrn-0.9.7.3/src/art_misc.c
int _slrn_art_unfold_header_lines (Slrn_Article_Type *a) /*{{{*/
{
Slrn_Article_Line_Type *l;
-@@ -952,6 +1105,9 @@
-
+@@ -979,6 +1132,9 @@ int _slrn_art_unfold_header_lines (Slrn_
+
l = l->next;
}
+
@@ -204,9 +204,10 @@ diff -ur slrn-0.9.7.3.orig/src/art_misc.c slrn-0.9.7.3/src/art_misc.c
return 0;
}
---- slrn/src/startup.c.orig 2008-07-25 20:27:27.861397112 +0200
-+++ slrn/src/startup.c 2008-07-25 20:27:56.656744273 +0200
-@@ -617,6 +617,7 @@
+diff -urNp -x '*.orig' slrn-1.0.3.org/src/startup.c slrn-1.0.3/src/startup.c
+--- slrn-1.0.3.org/src/startup.c 2021-10-03 22:48:59.367724784 +0200
++++ slrn-1.0.3/src/startup.c 2021-10-03 22:48:59.524391275 +0200
+@@ -626,6 +626,7 @@ Slrn_Int_Var_Type Slrn_Int_Variables []
{"cc_followup", &Slrn_Auto_CC_To_Poster, NULL},
{"use_tmpdir", &Slrn_Use_Tmpdir, NULL},
{"sorting_method", &Slrn_Sorting_Mode, NULL},
diff --git a/slrn-user-agent.patch b/slrn-user-agent.patch
index 016f329..dbfff82 100644
--- a/slrn-user-agent.patch
+++ b/slrn-user-agent.patch
@@ -1,22 +1,23 @@
-diff -Nur slrn-0.9.8.0.orig/macros/uname.sl slrn-0.9.8.0/macros/uname.sl
---- slrn-0.9.8.0.orig/macros/uname.sl 1970-01-01 01:00:00.000000000 +0100
-+++ slrn-0.9.8.0/macros/uname.sl 2003-08-26 20:30:42.442283944 +0200
+diff -urNp -x '*.orig' slrn-1.0.3.org/macros/INSTFILES slrn-1.0.3/macros/INSTFILES
+--- slrn-1.0.3.org/macros/INSTFILES 2016-10-24 00:34:16.000000000 +0200
++++ slrn-1.0.3/macros/INSTFILES 2021-10-03 22:48:59.187724986 +0200
+@@ -15,3 +15,4 @@ varset.sl
+ xcomment.sl
+ mime.sl
+ mailcap.sl
++uname.sl
+diff -urNp -x '*.orig' slrn-1.0.3.org/macros/uname.sl slrn-1.0.3/macros/uname.sl
+--- slrn-1.0.3.org/macros/uname.sl 1970-01-01 01:00:00.000000000 +0100
++++ slrn-1.0.3/macros/uname.sl 2021-10-03 22:48:59.187724986 +0200
@@ -0,0 +1,4 @@
+% example of customizing User-Agent header
+
+set_string_variable("system_type", uname().sysname + " " + uname().release
+ + "/" + uname().machine);
---- slrn-1.0.2/macros/INSTFILES.orig 2016-06-26 20:26:17.435600753 +0200
-+++ slrn-1.0.2/macros/INSTFILES 2016-06-26 20:27:20.788590874 +0200
-@@ -15,3 +15,4 @@
- xcomment.sl
- mime.sl
- mailcap.sl
-+uname.sl
-diff -Nur slrn-0.9.8.0.orig/src/misc.h slrn-0.9.8.0/src/misc.h
---- slrn-0.9.8.0.orig/src/misc.h 2002-10-06 00:19:51.000000000 +0200
-+++ slrn-0.9.8.0/src/misc.h 2003-08-26 20:30:42.443283792 +0200
-@@ -81,6 +81,8 @@
+diff -urNp -x '*.orig' slrn-1.0.3.org/src/misc.h slrn-1.0.3/src/misc.h
+--- slrn-1.0.3.org/src/misc.h 2016-10-24 00:34:16.000000000 +0200
++++ slrn-1.0.3/src/misc.h 2021-10-03 22:48:59.187724986 +0200
+@@ -83,6 +83,8 @@ typedef struct
#endif
char *posting_host; /* FQDN or NULL */
char *login_name;
@@ -25,9 +26,10 @@ diff -Nur slrn-0.9.8.0.orig/src/misc.h slrn-0.9.8.0/src/misc.h
}
Slrn_User_Info_Type;
---- slrn/src/post.c.orig 2008-07-11 07:54:20.000000000 +0200
-+++ slrn/src/post.c 2008-07-25 20:25:59.896750139 +0200
-@@ -666,9 +666,16 @@
+diff -urNp -x '*.orig' slrn-1.0.3.org/src/post.c slrn-1.0.3/src/post.c
+--- slrn-1.0.3.org/src/post.c 2016-10-24 00:34:16.000000000 +0200
++++ slrn-1.0.3/src/post.c 2021-10-03 22:48:59.187724986 +0200
+@@ -662,9 +662,16 @@ static int prepare_header (VFILE *vp, un
int newsgroups_found=0, subject_found=0, followupto_found=0;
Slrn_Mime_Error_Obj *err=NULL;
Slrn_Mime_Error_Obj *mime_err;
@@ -44,8 +46,8 @@ diff -Nur slrn-0.9.8.0.orig/src/misc.h slrn-0.9.8.0/src/misc.h
+ User_Agent = "slrn";
#if SLRN_HAS_STRICT_FROM
- if (NULL != (tmp = slrn_make_from_string ()))
-@@ -825,7 +832,7 @@
+ if (NULL != (tmp = slrn_make_from_header ()))
+@@ -821,7 +828,7 @@ static int prepare_header (VFILE *vp, un
if ((NULL == (tmp = slrn_gen_date_header ()))
|| (NULL == slrn_append_to_header (a, tmp, 1))
@@ -54,9 +56,10 @@ diff -Nur slrn-0.9.8.0.orig/src/misc.h slrn-0.9.8.0/src/misc.h
|| (NULL == slrn_append_to_header (a, tmp, 1))
|| (NULL == slrn_append_to_header (a, NULL,0))) /* separator */
{
---- slrn/src/startup.c.orig 2008-07-10 07:15:22.000000000 +0200
-+++ slrn/src/startup.c 2008-07-25 20:26:23.960750978 +0200
-@@ -756,6 +756,8 @@
+diff -urNp -x '*.orig' slrn-1.0.3.org/src/startup.c slrn-1.0.3/src/startup.c
+--- slrn-1.0.3.org/src/startup.c 2016-10-24 00:34:16.000000000 +0200
++++ slrn-1.0.3/src/startup.c 2021-10-03 22:48:59.191058315 +0200
+@@ -766,6 +766,8 @@ Slrn_Str_Var_Type Slrn_Str_Variables []
{"followup_custom_headers", &Slrn_Followup_Custom_Headers, NULL},
{"reply_custom_headers", &Slrn_Reply_Custom_Headers, NULL},
{"supersedes_custom_headers", &Slrn_Supersedes_Custom_Headers, NULL},
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/slrn.git/commitdiff/33957255b1dfb3bf5aa313bc6d963648677ba154
More information about the pld-cvs-commit
mailing list