Hello community, here is the log from the commit of package sl for openSUSE:Factory checked in at 2019-08-27 10:18:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sl (Old) and /work/SRC/openSUSE:Factory/.sl.new.7948 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sl" Tue Aug 27 10:18:16 2019 rev:1 rq:720793 version:5.02 Changes: -------- New Changes file: --- /dev/null 2019-08-07 02:59:15.679220339 +0200 +++ /work/SRC/openSUSE:Factory/.sl.new.7948/sl.changes 2019-08-27 10:18:18.939951838 +0200 @@ -0,0 +1,27 @@ +------------------------------------------------------------------- +Mon Jul 29 19:40:29 UTC 2019 - Sebastian Wagner <[email protected]> + +- Add Conflict with python3-softlayer. + +------------------------------------------------------------------- +Tue Jul 2 19:25:15 UTC 2019 - Sebastian Wagner <[email protected]> + +- specfile: fix license, add license and readme file + +------------------------------------------------------------------- +Thu Feb 21 09:36:34 UTC 2019 - [email protected] + +- Remove old patchfile. + +------------------------------------------------------------------- +Thu Feb 21 09:24:54 UTC 2019 - [email protected] + +- Change patchname to reference upstream-commit. + +------------------------------------------------------------------- +Thu Dec 27 20:25:32 UTC 2018 - Matej Cepl <[email protected]> + +- Initial packaging effort. Use verifiable 5.02 tarball, + and patch update_to_master_at_923e7d7.patch which lifts the + code up to the latest commit on the master branch now (commit + ID 923e7d7). New: ---- sl-5.02.tar.gz sl.changes sl.spec update_to_master_at_923e7d7.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sl.spec ++++++ # # spec file for package sl # # Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2012 <[email protected]> # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via https://bugs.opensuse.org/ # Name: sl Version: 5.02 Release: 0 Summary: Steam Locomotive in ASCII art # The warrany-claim is a bit different, but the rights are the same as in ISC License: ISC Group: Amusements/Toys/Other URL: https://github.com/mtoyoda/sl Source: https://github.com/mtoyoda/%{name}/archive/%{version}/%{name}-%{version}.tar.gz Patch0: update_to_master_at_923e7d7.patch BuildRequires: ncurses-devel Conflicts: python3-softlayer %description SL (Steam Locomotive) runs across your terminal when you type "sl" as you meant to type "ls". It's just a joke command, and not useful at all. %prep %setup -q %patch0 -p1 %build make OPTFLAGS="%{optflags}" %{?_smp_mflags} %install install -d %{buildroot}%{_bindir} install -d %{buildroot}%{_mandir}/man1 cp sl %{buildroot}%{_bindir}/sl cp sl.1 %{buildroot}%{_mandir}/man1/sl.1 %files %{_mandir}/man1/sl.1%{?ext_man} %{_bindir}/%{name} %doc README.md %license LICENSE %changelog ++++++ update_to_master_at_923e7d7.patch ++++++ --- a/Makefile +++ b/Makefile @@ -7,7 +7,14 @@ #========================================== CC=gcc -CFLAGS=-O +CFLAGS=-O -Wall + +all: sl sl: sl.c sl.h $(CC) $(CFLAGS) -o sl sl.c -lncurses + +clean: + rm -f sl + +distclean: clean --- a/README.md +++ b/README.md @@ -6,3 +6,5 @@ you meant to type "ls". It's just a joke all. Copyright 1993,1998,2014 Toyoda Masashi ([email protected]) + + \ No newline at end of file --- a/sl.1 +++ b/sl.1 @@ -20,7 +20,7 @@ is a highly advanced animation program f An accident is occurring. People cry for help. .TP .B \-l -Little version +Little version. .TP .B \-F It flies like the galaxy express 999. --- a/sl.c +++ b/sl.c @@ -1,11 +1,13 @@ /*======================================== - * sl.c: SL version 5.02 - * Copyright 1993,1998,2014 + * sl.c: SL version 5.03 + * Copyright 1993,1998,2014-2015 * Toyoda Masashi * ([email protected]) * Last Modified: 2014/06/03 *======================================== */ +/* sl version 5.03 : Fix some more compiler warnings. */ +/* by Ryan Jacobs 2015/01/19 */ /* sl version 5.02 : Fix compiler warnings. */ /* by Jeff Schwab 2014/06/03 */ /* sl version 5.01 : removed cursor and handling of IO */ @@ -33,7 +35,7 @@ /* by Toyoda Masashi 1992/12/14 */ /* sl version 1.01 : Add more complex smoke. */ /* by Toyoda Masashi 1992/12/14 */ -/* sl version 1.00 : SL runs vomitting out smoke. */ +/* sl version 1.00 : SL runs vomiting out smoke. */ /* by Toyoda Masashi 1992/12/11 */ #include <curses.h> @@ -65,7 +67,7 @@ int my_mvaddstr(int y, int x, char *str) void option(char *str) { - extern int ACCIDENT, FLY, LONG; + extern int ACCIDENT, LOGO, FLY, C51; while (*str != '\0') { switch (*str++) { @@ -111,12 +113,14 @@ int main(int argc, char *argv[]) } mvcur(0, COLS - 1, LINES - 1, 0); endwin(); + + return 0; } int add_sl(int x) { - static char *sl[LOGOPATTERNS][LOGOHIGHT + 1] + static char *sl[LOGOPATTERNS][LOGOHEIGHT + 1] = {{LOGO1, LOGO2, LOGO3, LOGO4, LWHL11, LWHL12, DELLN}, {LOGO1, LOGO2, LOGO3, LOGO4, LWHL21, LWHL22, DELLN}, {LOGO1, LOGO2, LOGO3, LOGO4, LWHL31, LWHL32, DELLN}, @@ -124,10 +128,10 @@ int add_sl(int x) {LOGO1, LOGO2, LOGO3, LOGO4, LWHL51, LWHL52, DELLN}, {LOGO1, LOGO2, LOGO3, LOGO4, LWHL61, LWHL62, DELLN}}; - static char *coal[LOGOHIGHT + 1] + static char *coal[LOGOHEIGHT + 1] = {LCOAL1, LCOAL2, LCOAL3, LCOAL4, LCOAL5, LCOAL6, DELLN}; - static char *car[LOGOHIGHT + 1] + static char *car[LOGOHEIGHT + 1] = {LCAR1, LCAR2, LCAR3, LCAR4, LCAR5, LCAR6, DELLN}; int i, y, py1 = 0, py2 = 0, py3 = 0; @@ -136,10 +140,10 @@ int add_sl(int x) y = LINES / 2 - 3; if (FLY == 1) { - y = (x / 6) + LINES - (COLS / 6) - LOGOHIGHT; + y = (x / 6) + LINES - (COLS / 6) - LOGOHEIGHT; py1 = 2; py2 = 4; py3 = 6; } - for (i = 0; i <= LOGOHIGHT; ++i) { + for (i = 0; i <= LOGOHEIGHT; ++i) { my_mvaddstr(y + i, x, sl[(LOGOLENGTH + x) / 3 % LOGOPATTERNS][i]); my_mvaddstr(y + i + py1, x + 21, coal[i]); my_mvaddstr(y + i + py2, x + 42, car[i]); @@ -157,7 +161,7 @@ int add_sl(int x) int add_D51(int x) { - static char *d51[D51PATTERNS][D51HIGHT + 1] + static char *d51[D51PATTERNS][D51HEIGHT + 1] = {{D51STR1, D51STR2, D51STR3, D51STR4, D51STR5, D51STR6, D51STR7, D51WHL11, D51WHL12, D51WHL13, D51DEL}, {D51STR1, D51STR2, D51STR3, D51STR4, D51STR5, D51STR6, D51STR7, @@ -170,7 +174,7 @@ int add_D51(int x) D51WHL51, D51WHL52, D51WHL53, D51DEL}, {D51STR1, D51STR2, D51STR3, D51STR4, D51STR5, D51STR6, D51STR7, D51WHL61, D51WHL62, D51WHL63, D51DEL}}; - static char *coal[D51HIGHT + 1] + static char *coal[D51HEIGHT + 1] = {COAL01, COAL02, COAL03, COAL04, COAL05, COAL06, COAL07, COAL08, COAL09, COAL10, COALDEL}; @@ -180,10 +184,10 @@ int add_D51(int x) y = LINES / 2 - 5; if (FLY == 1) { - y = (x / 7) + LINES - (COLS / 7) - D51HIGHT; + y = (x / 7) + LINES - (COLS / 7) - D51HEIGHT; dy = 1; } - for (i = 0; i <= D51HIGHT; ++i) { + for (i = 0; i <= D51HEIGHT; ++i) { my_mvaddstr(y + i, x, d51[(D51LENGTH + x) % D51PATTERNS][i]); my_mvaddstr(y + i + dy, x + 53, coal[i]); } @@ -197,7 +201,7 @@ int add_D51(int x) int add_C51(int x) { - static char *c51[C51PATTERNS][C51HIGHT + 1] + static char *c51[C51PATTERNS][C51HEIGHT + 1] = {{C51STR1, C51STR2, C51STR3, C51STR4, C51STR5, C51STR6, C51STR7, C51WH11, C51WH12, C51WH13, C51WH14, C51DEL}, {C51STR1, C51STR2, C51STR3, C51STR4, C51STR5, C51STR6, C51STR7, @@ -210,7 +214,7 @@ int add_C51(int x) C51WH51, C51WH52, C51WH53, C51WH54, C51DEL}, {C51STR1, C51STR2, C51STR3, C51STR4, C51STR5, C51STR6, C51STR7, C51WH61, C51WH62, C51WH63, C51WH64, C51DEL}}; - static char *coal[C51HIGHT + 1] + static char *coal[C51HEIGHT + 1] = {COALDEL, COAL01, COAL02, COAL03, COAL04, COAL05, COAL06, COAL07, COAL08, COAL09, COAL10, COALDEL}; @@ -220,10 +224,10 @@ int add_C51(int x) y = LINES / 2 - 5; if (FLY == 1) { - y = (x / 7) + LINES - (COLS / 7) - C51HIGHT; + y = (x / 7) + LINES - (COLS / 7) - C51HEIGHT; dy = 1; } - for (i = 0; i <= C51HIGHT; ++i) { + for (i = 0; i <= C51HEIGHT; ++i) { my_mvaddstr(y + i, x, c51[(C51LENGTH + x) % C51PATTERNS][i]); my_mvaddstr(y + i + dy, x + 55, coal[i]); } --- a/sl.h +++ b/sl.h @@ -7,7 +7,7 @@ *======================================== */ -#define D51HIGHT 10 +#define D51HEIGHT 10 #define D51FUNNEL 7 #define D51LENGTH 83 #define D51PATTERNS 6 @@ -60,7 +60,7 @@ #define COALDEL " " -#define LOGOHIGHT 6 +#define LOGOHEIGHT 6 #define LOGOFUNNEL 4 #define LOGOLENGTH 84 #define LOGOPATTERNS 6 @@ -104,7 +104,7 @@ #define DELLN " " -#define C51HIGHT 11 +#define C51HEIGHT 11 #define C51FUNNEL 7 #define C51LENGTH 87 #define C51PATTERNS 6
