PR#1: Updated to v0.23. - rpms/superkb

rpms / superkb

#1 Updated to v0.23.

Merged 3 years ago by rugebiker. Opened 3 years ago by renich.

rpms/ renich/superkb master into master

Renich Bon Ciric • 3 years ago

6952083

.gitignore

file modified

		`@@ -1,1 +1,2 @@`
		`/superkb-0.22.tar.gz`
		`+ /superkb-v0.23.tar.gz`

patch-drawklib.patch

file removed

-11

		`@@ -1,11 +0,0 @@`
		`- --- drawkblib.c 2011-03-18 15:36:45.000000000 -0700`
		`- +++ drawkblib2.c 2013-06-26 13:28:09.301904539 -0700`
		`- @@ -23,8 +23,6 @@`
		`- #include "drawkblibs/drawkblibs-xlib.h"`
		`- #include "drawkblibs/drawkblibs-cairo.h"`
		`-`
		`- -#define LIB_PREFIX "/usr/lib/"`
		`- -`
		`- #ifndef WITH_DRAWKBLIBS_XLIB`
		`- #define drawkblibs_xlib_init NULL`
		`- #endif`

patch-fix_ldlibs_m_position_on_invocation.patch

file added

+23

		`@@ -0,0 +1,23 @@`
		`+ Description: Fix ldlibs-m position on compiler invocation`
		`+ LDLIBS (or whatever variable has a similar function) must always go`
		`+ at the end of GCC invocation. There is an error in upstream but for some`
		`+ reason it didn't affect Debian, only Ubuntu.`
		`+ .`
		`+ This patch fixes this.`
		`+`
		`+ Author: Octavio Alvarez <alvarezp@alvarezp.com>`
		`+ Origin: https://gitlab.com/alvarezp2000/superkb/-/commit/708bc08e91d546267fc7a815cd390b9bc45ac349`
		`+ Forwarded: not-needed`
		`+ Last-Update: 2020-09-05`
		`+`
		`+ --- superkb-0.23.orig/Makefile`
		`+ +++ superkb-0.23/Makefile`
		`+ @@ -140,7 +140,7 @@ puticon/puticon-gdkpixbuf.o: puticon/put`
		`+`
		`+`
		`+ $(SHARED): %.so: %.o`
		`+ - gcc $(ldlibs-m) $(LDFLAGS) -shared -o $@ $<`
		`+ + gcc -shared -o $@ $< $(LDFLAGS) $(ldlibs-m)`
		`+`
		`+ .PHONY : relink`
		`+ relink:`

patch-imagelib.patch

file removed

-11

		`@@ -1,11 +0,0 @@`
		`- --- imagelib.c 2011-03-18 15:36:45.000000000 -0700`
		`- +++ imagelib2.c 2013-06-26 13:27:38.280048587 -0700`
		`- @@ -23,8 +23,6 @@`
		`- #include "puticon/puticon-gdkpixbuf.h"`
		`- #include "puticon/puticon-imlib2.h"`
		`-`
		`- -#define LIB_PREFIX "/usr/lib/"`
		`- -`
		`- #ifndef WITH_GDKPIXBUF`
		`- #define pi_gdkpixbuf_init NULL`
		`- #endif`

patch-makeinstall.patch

file modified

+16 -25

		`@@ -1,44 +1,35 @@`
		`- --- Makefile 2013-06-25 23:28:34.584451325 -0700`
		`- +++ Makefile2 2013-07-01 20:12:57.063323278 -0700`
		`- @@ -45,7 +45,7 @@`
		`+ diff --git a/Makefile b/Makefile`
		`+ index 058fad9..71a1a49 100755`
		`+ --- a/Makefile`
		`+ +++ b/Makefile`
		`+ @@ -68,7 +68,7 @@ MACROS=-DPREFIX=$(PREFIX) -DLIBDIRNAME=$(LIBDIRNAME)`
		`#Special variables`
		`SHELL=/bin/sh`
		`CC=gcc`
		`- -CFLAGS=-Wall -std=c99 -pedantic-errors $(WEXTRA) $(syms-y) $(cflags-y) $(cflags-m) -ggdb -fPIC -DVEXTRA=\""$(version_extrainfo)"\"`
		`- +CFLAGS=-D LIB_PREFIX=\"$(LIB_PREFIX)/\" $(FED_FLAGS) -std=c99 -pedantic-errors $(WEXTRA) $(syms-y) $(cflags-y) $(cflags-m) -ggdb -fPIC -DVEXTRA=\""$(version_extrainfo)"\"`
		`+ -CFLAGS+=-Wall -std=c99 $(PEDANTIC_ERRORS) $(WEXTRA) $(syms-y) $(cflags-y) $(cflags-m) -ggdb -fPIC -DVEXTRA=\""$(version_extrainfo)"\" $(MACROS)`
		`+ +CFLAGS=$(FED_FLAGS) -std=c99 -pedantic-errors $(WEXTRA) $(syms-y) $(cflags-y) $(cflags-m) -ggdb -fPIC -DVEXTRA=\""$(version_extrainfo)"\"`
		`OBJS=superkb.o main.o superkbrc.o imagelib.o drawkblib.o debug.o timeval.o $(obj-y)`
		`LDPARAMS=-lX11 -lm -ldl -L/usr/X11R6/lib -L/usr/X11/lib $(ldlibs-y)`

		`- @@ -124,6 +124,7 @@`
		`-`
		`- .PHONY : install-app`
		`- install-app:`
		`- + mkdir -p $(DESTDIR)/usr/bin`
		`- cp $(APP) $(DESTDIR)/usr/bin`
		`- @[ -f ${DESTDIR}/usr/bin/superkb ] && { \`
		`- echo ; \`
		`- @@ -140,13 +141,14 @@`
		`-`
		`- .PHONY : install-man`
		`- install-man:`
		`- + mkdir -p $(DESTDIR)$(PREFIX)/share/man/man1`
		`- install man/superkb.1 $(DESTDIR)/usr/share/man/man1/superkb.1`
		`-`
		`+ @@ -179,18 +179,18 @@ install-man:`

		`.PHONY : install-shared`
		`install-shared:`
		`- - mkdir -p $(DESTDIR)/usr/lib/superkb`
		`- - [ -n "$(SHARED)" ] && cp $(SHARED) $(DESTDIR)/usr/lib/superkb/ \|\| true`
		`+ - mkdir -p $(DESTDIR)/$(PREFIX)/$(LIBDIRNAME)/superkb`
		`+ - [ -n "$(SHARED)" ] && cp $(SHARED) $(DESTDIR)/$(PREFIX)/$(LIBDIRNAME)/superkb/ \|\| true`
		`+ mkdir -p $(DESTDIR)$(LIB_PREFIX)/superkb`
		`+ [ -n "$(SHARED)" ] && cp $(SHARED) $(DESTDIR)$(LIB_PREFIX)/superkb/ \|\| true`

		`.PHONY : uninstall`
		`uninstall:`
		`- @@ -156,7 +158,7 @@`
		`-`
		`+ $(MAKE) uninstall-app`
		`+ $(MAKE) uninstall-man`
		`+ $(MAKE) uninstall-shared`
		`+ -`
		`+ +`
		`.PHONY : uninstall-shared`
		`uninstall-shared:`
		`- - [ -d /usr/lib/superkb ] && rm -fr $(DESTDIR)/usr/lib/superkb`
		`+ - [ -d /$(PREFIX)/$(LIBDIRNAME)/superkb ] && rm -fr $(DESTDIR)/$(PREFIX)/$(LIBDIRNAME)/superkb`
		`+ [ -d $(LIB_PREFIX)/superkb ] && rm -fr $(DESTDIR)$(LIB_PREFIX)/superkb`

		`.PHONY : uninstall-man`

sources

file modified

+1 -1

		`@@ -1,1 +1,1 @@`
		`- 68be854fb0823d738e02c85eb8ca9e27 superkb-0.22.tar.gz`
		`+ SHA512 (superkb-v0.23.tar.gz) = 863ca2683b1936a9253a2c5a4365f266b7a021d6c6e63fd836002bf33479f9cb8e4e26cc7a31a9e9ab4dee6eb9fa74a9a343524bbb3b23ffa89180b898691264`

superkb.spec

file modified

+24 -18

		`@@ -1,20 +1,23 @@`
		`+ %global gittag v0.23`
		`+ %global commit 83a0bd56de9cfce918a47bdf601a9ecdb5cd56de`
		`+`
		`Name: superkb`
		`- Version: 0.22`
		`- Release: 18%{?dist}`
		`+ Version: 0.23`
		`+ Release: 1%{?dist}`
		`Summary: Graphical application launcher for Linux`
		`License: GPLv2`
		`- URL: http://superkb.sourceforge.net/`
		`- Source0: http://downloads.sourceforge.net/project/%{name}/%{name}/%{version}/%{name}-%{version}.tar.gz`
		`- Patch0: patch-drawklib.patch`
		`- Patch1: patch-imagelib.patch`
		`- Patch2: patch-makeinstall.patch`
		`+ URL: http://superkb.org/`
		`+ Source0: https://gitlab.com/alvarezp2000/%{name}/-/archive/%{gittag}/%{name}-v%{version}.tar.gz`
		`+ Patch0: patch-makeinstall.patch`
		`+ Patch1: patch-fix_ldlibs_m_position_on_invocation.patch`
		`+ BuildRequires: cairo-devel`
		`BuildRequires: gcc`
		`- BuildRequires: libXinerama-devel`
		`BuildRequires: gdk-pixbuf2-xlib-devel`
		`+ BuildRequires: help2man`
		`BuildRequires: imlib2-devel`
		`- BuildRequires: cairo-devel`
		`- BuildRequires: pango-devel`
		`BuildRequires: libXft-devel`
		`+ BuildRequires: libXinerama-devel`
		`+ BuildRequires: pango-devel`
		`BuildRequires: xorg-x11-proto-devel`

		`%description`
		`@@ -24,13 +27,8 @@`


		`%prep`
		`- %setup -q`
		`- %patch0`
		`- %patch1`
		`- %patch2`
		`- iconv -f iso8859-1 -t utf-8 changelog.en.txt > changelog.en.txt.conv && mv -f changelog.en.txt.conv changelog.en.txt`
		`- iconv -f iso8859-1 -t utf-8 changelog.es.txt > changelog.es.txt.conv && mv -f changelog.es.txt.conv changelog.es.txt`
		`- chmod a-x LICENSE`
		`+ %autosetup -n %{name}-%{gittag}`
		`+`

		`%build`
		`make %{?_smp_mflags} PREFIX=%{_prefix} LIB_PREFIX=%{_libdir} FED_FLAGS="%{optflags} -Wno-return-type -Wno-unused-result -Wno-maybe-uninitialized -Wno-deprecated-declarations -Wno-unused-variable"`
		`@@ -41,7 +39,7 @@`


		`%files`
		`- %doc LICENSE changelog.en.txt changelog.es.txt`
		`+ %doc LICENSE`
		`%{_bindir}/%{name}`
		`%dir %{_libdir}/%{name}`
		`%{_libdir}/%{name}/drawkblibs-cairo.so`
		`@@ -52,6 +50,14 @@`


		`%changelog`
		`+ * Wed Nov 4 22:28:41 CST 2020 Renich Bon Ciric <renich@woralelandia.com> - 0.23-1`
		`+ - Updated to v0.23.`
		`+ - This release includes some aesthetic fixes, compilation warning fixes and`
		`+ fixes to make the job easier for package maintainers.`
		`+ - Re-generated the old patches that were still useful.`
		`+ - Removed patches that weren't necessary anymore.`
		`+ - Added patch to fix lib position on the compiler.`
		`+`
		`* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.22-18`
		`- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild`

renich commented 3 years ago

This release includes some aesthetic fixes, compilation warning fixes and
fixes to make the job easier for package maintainers.
Re-generated the old patches that were still useful.
Removed patches that weren't necessary anymore.
Added patch to fix lib position on the compiler.