PR#1: Update to 0.9.3.1. - rpms/gtkdatabox

rpms / gtkdatabox

#1 Update to 0.9.3.1.

Merged 5 years ago by ework. Opened 5 years ago by vascom.

Unknown source master into master

Vasiliy Glazov • 5 years ago

203db7e

.gitignore

file modified

		`@@ -1,1 +1,2 @@`
		`/gtkdatabox-0.9.2.0.tar.gz`
ework commented 5 years ago We wouldn't need this old line anymore since we're updating the tar file.
		`+ /gtkdatabox-0.9.3.1.tar.gz`

gtkdatabox-0.8.2.0-userpmoptflags.patch

file removed

-48

		`@@ -1,48 +0,0 @@`
		`- diff -urN gtkdatabox-0.8.2.0.orig/examples/Makefile.am gtkdatabox-0.8.2.0/examples/Makefile.am`
ework commented 5 years ago If we remove this patch how does `${RPM_OPT_FLAGS}` get applied so hardening is used? Looking at the latest sources these patched files haven't changed much.
		`- --- gtkdatabox-0.8.2.0.orig/examples/Makefile.am 2007-12-18 10:36:44.000000000 -0800`
		`- +++ gtkdatabox-0.8.2.0/examples/Makefile.am 2007-12-18 10:38:00.000000000 -0800`
		`- @@ -41,7 +41,7 @@`
		`- -I$(top_srcdir)/gtk`
		`-`
		`- AM_CFLAGS =\`
		`- - -O2\`
		`- + $(RPM_OPT_FLAGS)\`
		`- -W -Wall -pedantic\`
		`- -DG_DISABLE_DEPRECATED\`
		`- -DGDK_DISABLE_DEPRECATED\`
		`- diff -urN gtkdatabox-0.8.2.0.orig/examples/Makefile.in gtkdatabox-0.8.2.0/examples/Makefile.in`
		`- --- gtkdatabox-0.8.2.0.orig/examples/Makefile.in 2007-12-18 10:36:44.000000000 -0800`
		`- +++ gtkdatabox-0.8.2.0/examples/Makefile.in 2007-12-18 10:38:00.000000000 -0800`
		`- @@ -264,7 +264,7 @@`
		`- -I$(top_srcdir)/gtk`
		`-`
		`- AM_CFLAGS = \`
		`- - -O2\`
		`- + $(RPM_OPT_FLAGS)\`
		`- -W -Wall -pedantic\`
		`- -DG_DISABLE_DEPRECATED\`
		`- -DGDK_DISABLE_DEPRECATED\`
		`- diff -urN gtkdatabox-0.8.2.0.orig/gtk/Makefile.am gtkdatabox-0.8.2.0/gtk/Makefile.am`
		`- --- gtkdatabox-0.8.2.0.orig/gtk/Makefile.am 2007-12-18 10:36:44.000000000 -0800`
		`- +++ gtkdatabox-0.8.2.0/gtk/Makefile.am 2007-12-18 10:38:00.000000000 -0800`
		`- @@ -48,7 +48,7 @@`
		`- -I$(top_srcdir)`
		`-`
		`- AM_CFLAGS =\`
		`- - -O2\`
		`- + $(RPM_OPT_FLAGS)\`
		`- -W -Wall -pedantic\`
		`- -DG_DISABLE_DEPRECATED\`
		`- -DGDK_DISABLE_DEPRECATED\`
		`- diff -urN gtkdatabox-0.8.2.0.orig/gtk/Makefile.in gtkdatabox-0.8.2.0/gtk/Makefile.in`
		`- --- gtkdatabox-0.8.2.0.orig/gtk/Makefile.in 2007-12-18 10:36:44.000000000 -0800`
		`- +++ gtkdatabox-0.8.2.0/gtk/Makefile.in 2007-12-18 10:38:00.000000000 -0800`
		`- @@ -246,7 +246,7 @@`
		`- -I$(top_srcdir)`
		`-`
		`- AM_CFLAGS = \`
		`- - -O2\`
		`- + $(RPM_OPT_FLAGS)\`
		`- -W -Wall -pedantic\`
		`- -DG_DISABLE_DEPRECATED\`
		`- -DGDK_DISABLE_DEPRECATED\`

gtkdatabox.spec

file modified

+10 -8

		`@@ -1,11 +1,10 @@`
		`Name: gtkdatabox`
		`- Version: 0.9.2.0`
		`- Release: 12%{?dist}`
		`+ Version: 0.9.3.1`
		`+ Release: 1%{?dist}`
		`Summary: GTK+ widget for fast data display`
		`License: LGPLv2+`
		`URL: http://sourceforge.net/projects/gtkdatabox`
		`Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz`
		`- Patch0: gtkdatabox-0.8.2.0-userpmoptflags.patch`
		`BuildRequires: gcc`
		`BuildRequires: gtk2-devel, pkgconfig, autoconf`
		`BuildRequires: libglade2-devel, glade3-libgladeui-devel`
		`@@ -39,8 +38,7 @@`
		`The %{name}-glade3 package contains support files for glade3-libgladeui.`

		`%prep`
		`- %setup -q`
		`- %patch0 -p1 -b .optflags`
		`+ %autosetup`

		`%build`
		`# need reconfig to support aarch64`
		`@@ -55,17 +53,18 @@`
		`sed -i 's\|^runpath_var=LD_RUN_PATH\|runpath_var=DIE_RPATH_DIE\|g' libtool`
		`# fix ChangeLog encoding issues`
		`iconv -f iso8859-1 -t utf-8 ChangeLog > ChangeLog.tmp && mv -f ChangeLog.tmp ChangeLog`
		`- make %{?_smp_mflags}`
		`+ %make_build`

		`%install`
		`rm -rf %{buildroot}`
		`- make install DESTDIR=%{buildroot}`
		`+ %make_install`
		`find %{buildroot} -name '*.la' -exec rm -f {} ';'`

		`%ldconfig_scriptlets`

		`%files`
		`- %doc AUTHORS ChangeLog COPYING NEWS README TODO`
		`+ %doc AUTHORS ChangeLog NEWS README TODO`
		`+ %license COPYING`
		`%{_libdir}/libgtkdatabox-.so.`

		`%files devel`
		`@@ -82,6 +81,9 @@`
		`%{_datadir}/glade3/catalogs/gtkdatabox.xml`

		`%changelog`
		`+ * Tue Mar 19 2019 Vasiliy N. Glazov <vascom2@gmail.com> - 0.9.3.1-1`
		`+ - Update to 0.9.3.1`
		`+`
		`* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.2.0-12`
		`- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild`

sources

file modified

+1 -1

		`@@ -1,1 +1,1 @@`
		`- 99c1fe9a918ee94e2b6f967cd22a6f5b gtkdatabox-0.9.2.0.tar.gz`
		`+ SHA512 (gtkdatabox-0.9.3.1.tar.gz) = e527cd3fec752839fd336e0e25a156e503403e71c98c500e44f5dfbae3debbcd1d76084a12dc1162ecc78395071ce2bd27e0dca8c09096ae33831cd2d0698851`

vascom commented 5 years ago

Please apply this changes to update package.

ework commented on line 2 of .gitignore 5 years ago

We wouldn't need this old line anymore since we're updating the tar file.

ework commented on line 2 of gtkdatabox-0.8.2.0-userpmoptflags.patch 5 years ago

If we remove this patch how does ${RPM_OPT_FLAGS} get applied so hardening is used? Looking at the latest sources these patched files haven't changed much.

vascom commented 5 years ago

As I see in build log it already use fedora's build flags.
https://paste.fedoraproject.org/paste/1Rt85SFQG9KYk7Qdf6E9Rg

For example:
libtool: compile: gcc -DHAVE_CONFIG_H -I. -I.. -I.. -O2 -W -Wall -pedantic -DG_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGTK_DISABLE
_DEPRECATED -DGTK_MULTIHEAD_SAFE=1 -DGTK_DISABLE_SINGLE_INCLUDES -I/usr/include/gtk-2.0 -I/usr/lib64/gtk-2.0/include -I/usr/include/pango-1.0 -I
/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/include/fribidi -I/usr/include/harfbuzz -I/usr/include/freetype2 -I/usr/include/libpn
g16 -I/usr/include/uuid -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/libmount -I/usr/include/blkid
-I/usr/include/atk-1.0 -pthread -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS -fexceptions -fstac
k-protector-strong -grecord-gcc-switches -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 -m64 -mtun
e=generic -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection -c gtkdatabox_lines.c -fPIC -DPIC -o .libs/gtkdatabox_lines.o

Edited 5 years ago by vascom

vascom commented 5 years ago