Hello community, here is the log from the commit of package sash for openSUSE:Factory checked in at 2017-06-17 10:20:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sash (Old) and /work/SRC/openSUSE:Factory/.sash.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sash" Sat Jun 17 10:20:53 2017 rev:25 rq:502445 version:3.8 Changes: -------- --- /work/SRC/openSUSE:Factory/sash/sash.changes 2015-02-25 02:16:22.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.sash.new/sash.changes 2017-06-17 10:20:54.269396919 +0200 @@ -1,0 +2,6 @@ +Thu Jun 8 09:10:37 UTC 2017 - [email protected] + +- Refresh sash-Makefile.diff to respect cflags +- Move the binary to bindir instead of /bin bsc#1029975 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sash.spec ++++++ --- /var/tmp/diff_new_pack.QalExr/_old 2017-06-17 10:20:54.785324140 +0200 +++ /var/tmp/diff_new_pack.QalExr/_new 2017-06-17 10:20:54.785324140 +0200 @@ -1,7 +1,7 @@ # # spec file for package sash # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -31,7 +31,6 @@ BuildRequires: libext2fs-devel BuildRequires: ncurses-devel BuildRequires: zlib-devel-static -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description This package includes: @@ -50,16 +49,18 @@ %patch3 -p1 %build -export OPT="%{optflags} -O3" -make %{?_smp_mflags} CC="gcc" +make %{?_smp_mflags} CC="cc" OPT="%{optflags}" %install -make DESTDIR=%{buildroot} install +%make_install +mkdir -p %{buildroot}/bin +ln -s %{_bindir}/sash %{buildroot}/bin/sash %files %defattr(-,root,root) -/bin/sash %doc README CHANGES -%doc %{_mandir}/man1/sash.1.gz +%{_bindir}/sash +/bin/sash +%{_mandir}/man1/sash.1%{ext_man} %changelog ++++++ sash-Makefile.diff ++++++ --- /var/tmp/diff_new_pack.QalExr/_old 2017-06-17 10:20:54.813320191 +0200 +++ /var/tmp/diff_new_pack.QalExr/_new 2017-06-17 10:20:54.817319626 +0200 @@ -1,8 +1,17 @@ Index: Makefile =================================================================== ---- Makefile.orig 2014-11-19 14:51:20.911717387 +0100 -+++ Makefile 2014-11-19 15:00:39.429041277 +0100 -@@ -39,13 +39,12 @@ +--- Makefile.orig ++++ Makefile +@@ -27,7 +27,7 @@ HAVE_LINUX_MOUNT = 1 + HAVE_BSD_MOUNT = 0 + MOUNT_TYPE = '"ext3"' + +-OPT = -O3 ++OPT ?= -O3 + + CFLAGS = $(OPT) -Wall -Wmissing-prototypes \ + -DHAVE_GZIP=$(HAVE_GZIP) \ +@@ -39,13 +39,12 @@ CFLAGS = $(OPT) -Wall -Wmissing-prototyp -DHAVE_BSD_MOUNT=$(HAVE_BSD_MOUNT) \ -DMOUNT_TYPE=$(MOUNT_TYPE) @@ -11,13 +20,14 @@ DESTDIR = - BINDIR = /bin +-BINDIR = /bin -MANDIR = /usr/man ++BINDIR = /usr/bin +MANDIR = /usr/share/man OBJS = sash.o cmds.o cmd_dd.o cmd_ed.o cmd_grep.o cmd_ls.o cmd_tar.o \ -@@ -53,14 +52,15 @@ +@@ -53,14 +52,15 @@ OBJS = sash.o cmds.o cmd_dd.o cmd_ed.o c sash: $(OBJS)
