Hello community, here is the log from the commit of package bless for openSUSE:Factory checked in at 2019-07-26 12:40:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/bless (Old) and /work/SRC/openSUSE:Factory/.bless.new.4126 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "bless" Fri Jul 26 12:40:19 2019 rev:2 rq:718381 version:0.6.0 Changes: -------- --- /work/SRC/openSUSE:Factory/bless/bless.changes 2016-11-09 11:39:51.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.bless.new.4126/bless.changes 2019-07-26 12:40:21.093908592 +0200 @@ -1,0 +2,6 @@ +Wed Jul 24 08:23:37 UTC 2019 - Marguerite Su <[email protected]> + +- add dont-require-rarian.patch, fix boo#1141386 + * rarian/scrollkeeper is unmaintained upstream + +------------------------------------------------------------------- New: ---- dont-require-rarian.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bless.spec ++++++ --- /var/tmp/diff_new_pack.v4CtG8/_old 2019-07-26 12:40:21.813908172 +0200 +++ /var/tmp/diff_new_pack.v4CtG8/_new 2019-07-26 12:40:21.813908172 +0200 @@ -1,7 +1,7 @@ # # spec file for package bless # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 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 @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -20,21 +20,22 @@ Version: 0.6.0 Release: 0 Summary: Gtk#-based Hex-editor written in C# -License: GPL-2.0 +License: GPL-2.0-only Group: Development/Tools/Other Url: http://home.gna.org/bless Source: http://download.gna.org/bless/%{name}-%{version}.tar.gz Source1: http://download.gna.org/bless/bless-0.6.0.tar.gz.sig Source2: http://gna.org/people/viewgpg.php?user_id=1269#/alf82-key.gpg -BuildRequires: autoconf automake +#PATCH-FIX-UPSTREAM [email protected] - build without scrollkeeper/rarian +Patch: dont-require-rarian.patch +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: fdupes BuildRequires: pkgconfig +BuildRequires: update-desktop-files BuildRequires: pkgconfig(glade-sharp-2.0) BuildRequires: pkgconfig(gtk-sharp-2.0) BuildRequires: pkgconfig(mono) -BuildRequires: rarian-scrollkeeper-compat -BuildRequires: update-desktop-files -BuildRequires: fdupes -BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -61,13 +62,14 @@ This package contains the documentation. %prep -%setup -q - +%autosetup -p1 # Fix Build for Mono 4.0 -sed -i 's/gmcs/dmcs/' configure{,.ac} builder/ModuleBuilder.cs +sed -i 's/gmcs/mcs/' configure{,.ac} builder/ModuleBuilder.cs +autoreconf -fi %build -./configure --prefix=%{_prefix} --libdir=%{_libexecdir} --without-scrollkeeper +%configure --without-scrollkeeper +sed -i 's/$(MKDIR_P)/mkdir -p/' po/Makefile make %{?_smp_mflags} %install @@ -86,11 +88,9 @@ %defattr(-,root,root) %doc AUTHORS ChangeLog COPYING NEWS README %{_bindir}/bless -%{_libexecdir}/bless/ +%{_libdir}/bless %{_datadir}/applications/bless.desktop %{_datadir}/bless -%dir %{_datadir}/omf/ -%{_datadir}/omf/bless/ %{_datadir}/pixmaps/* %files doc ++++++ dont-require-rarian.patch ++++++ Index: bless-0.6.0/doc/user/Makefile.am =================================================================== --- bless-0.6.0.orig/doc/user/Makefile.am +++ bless-0.6.0/doc/user/Makefile.am @@ -1,20 +1,7 @@ DOCS=legal.xml bless-manual.xml -OMF=bless-manual.omf FIGURES=$(wildcard figures/*) -CLEANFILES=$(OMF) - -noinst_SCRIPTS=$(OMF) - - -$(OMF): $(OMF).in - if [ -x `which scrollkeeper-preinstall` ]; then \ - scrollkeeper-preinstall file:$(datadir)/doc/$(PACKAGE_NAME)/user/bless-manual.xml $(OMF).in $(OMF); \ - else \ - cp $(OMF).in $(OMF); \ - fi - doc: xsltproc /usr/share/xml/docbook/stylesheet/nwalsh/html/chunk.xsl bless-manual.xml @@ -22,7 +9,7 @@ doc: # Cannot use $(wildcard)... See http://savannah.gnu.org/bugs/?14617 dist-hook: doc ls *.html > html_file_list - cp --parents $(DOCS) $(OMF).in `cat html_file_list` \ + cp --parents $(DOCS) `cat html_file_list` \ $(FIGURES) $(distdir) rm html_file_list @@ -32,17 +19,6 @@ install-data-local: $(INSTALL_DATA) $(DOCS) $(wildcard *.html) \ $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)/user $(INSTALL_DATA) $(FIGURES) $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)/user/figures - $(INSTALL) -d $(DESTDIR)$(datadir)/omf/$(PACKAGE_NAME) - $(INSTALL_DATA) $(OMF) $(DESTDIR)$(datadir)/omf/$(PACKAGE_NAME) -if WITH_SCROLLKEEPER - scrollkeeper-update -o $(DESTDIR)$(datadir)/omf/$(PACKAGE_NAME) -endif uninstall-local: - rm -rf $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)/user - rm $(DESTDIR)$(datadir)/omf/$(PACKAGE_NAME)/$(OMF) -if WITH_SCROLLKEEPER - scrollkeeper-update -o $(DESTDIR)$(datadir)/omf/$(PACKAGE_NAME) -endif - rm -rf $(DESTDIR)$(datadir)/omf/$(PACKAGE_NAME) - + rm -rf $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)
