From 5117564112eb2366d5f0ba51685a32c3750ca98d0e97a684992497f769ba449c Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Thu, 16 May 2013 11:35:07 +0000 Subject: [PATCH] - updated to git snapshot 23dced0908 - fixes build failures - spec file cleanup OBS-URL: https://build.opensuse.org/package/show/graphics/gimp-plugin-resynthesizer?expand=0&rev=2 --- automake12.diff | 21 ------- bootchk-resynthesizer-v2.0-1-ge637010.tar.gz | 3 - gimp-plugin-resynthesizer.changes | 9 ++- gimp-plugin-resynthesizer.spec | 63 +++++++------------- resynthesizer-23dced0908.tar.gz | 3 + 5 files changed, 32 insertions(+), 67 deletions(-) delete mode 100644 automake12.diff delete mode 100644 bootchk-resynthesizer-v2.0-1-ge637010.tar.gz create mode 100644 resynthesizer-23dced0908.tar.gz diff --git a/automake12.diff b/automake12.diff deleted file mode 100644 index bf3dd3d..0000000 --- a/automake12.diff +++ /dev/null @@ -1,21 +0,0 @@ ---- bootchk-resynthesizer-e637010/autogen.sh.orig 2012-03-11 14:27:53.000000000 +0100 -+++ bootchk-resynthesizer-e637010/autogen.sh 2012-07-09 01:09:50.807630753 +0200 -@@ -68,6 +68,18 @@ elif (automake-1.10 --version) < /dev/nu - elif (automake-1.11 --version) < /dev/null > /dev/null 2>&1; then - AUTOMAKE=automake-1.11 - ACLOCAL=aclocal-1.11 -+elif (automake-1.12 --version) < /dev/null > /dev/null 2>&1; then -+ AUTOMAKE=automake-1.12 -+ ACLOCAL=aclocal-1.12 -+ echo "yes (1.12)" -+elif (automake-1.13 --version) < /dev/null > /dev/null 2>&1; then -+ AUTOMAKE=automake-1.13 -+ ACLOCAL=aclocal-1.13 -+ echo "yes (1.13)" -+elif (automake-1.14 --version) < /dev/null > /dev/null 2>&1; then -+ AUTOMAKE=automake-1.14 -+ ACLOCAL=aclocal-1.14 -+ echo "yes (1.14)" - elif (automake-1.6 --version) < /dev/null > /dev/null 2>&1; then - AUTOMAKE=automake-1.6 - ACLOCAL=aclocal-1.6 diff --git a/bootchk-resynthesizer-v2.0-1-ge637010.tar.gz b/bootchk-resynthesizer-v2.0-1-ge637010.tar.gz deleted file mode 100644 index 543d4a9..0000000 --- a/bootchk-resynthesizer-v2.0-1-ge637010.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:df9758e7c444d367d6fb5d0c816fd2c479dd8cd9e2aa5c9a82bdf4c898e1d983 -size 11168623 diff --git a/gimp-plugin-resynthesizer.changes b/gimp-plugin-resynthesizer.changes index 6d2ffda..2566cef 100644 --- a/gimp-plugin-resynthesizer.changes +++ b/gimp-plugin-resynthesizer.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu May 16 11:32:51 UTC 2013 - prusnak@opensuse.org + +- updated to git snapshot 23dced0908 + - fixes build failures +- spec file cleanup + ------------------------------------------------------------------- Sun Jul 8 23:29:59 UTC 2012 - jw@suse.com @@ -7,7 +14,7 @@ Sun Jul 8 23:29:59 UTC 2012 - jw@suse.com ------------------------------------------------------------------- Sun Jul 8 21:25:02 UTC 2012 - jw@suse.com -- fixed missing intltool and SUSE_ASNEEDED. +- fixed missing intltool and SUSE_ASNEEDED ------------------------------------------------------------------- Wed Oct 12 20:43:26 UTC 2011 - dmacvicar@suse.de diff --git a/gimp-plugin-resynthesizer.spec b/gimp-plugin-resynthesizer.spec index f9bbba9..a61a589 100644 --- a/gimp-plugin-resynthesizer.spec +++ b/gimp-plugin-resynthesizer.spec @@ -1,42 +1,25 @@ # -# spec file for package -# -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. -# -# 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 http://bugs.opensuse.org/ # -# norootforbuild +%define githash 23dced0908 -# bootchk-resynthesizer-v2.0-1-ge637010.tar.gz Name: gimp-plugin-resynthesizer -#global gitrev 72f3655 -#global revdate 20110906 -#global basever 1.0.1 -%global gitrev e637010 -%global revdate 20120708 -%global basever 2.0 -Version: %{basever}_%{revdate}_%{gitrev} -Release: 0 -License: GPL-3.0+ -Summary: Suite of gimp plugins for texture synthesis -Url: https://github.com/bootchk/resynthesizer -Group: Productivity/Graphics/Bitmap Editors -Source0: bootchk-resynthesizer-v%{basever}-1-g%{gitrev}.tar.gz -Patch1: automake12.diff -BuildRequires: gimp-devel gcc gimp -BuildRequires: intltool autoconf automake glib2-devel -#PreReq: -#Provides: +Version: 2.0 +Release: 0 +License: GPL-3.0+ +Summary: Suite of gimp plugins for texture synthesis +Url: https://github.com/bootchk/resynthesizer +Group: Productivity/Graphics/Bitmap Editors +# wget https://github.com/bootchk/resynthesizer/archive/master.tar.gz +Source: resynthesizer-%{githash}.tar.gz +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: gcc +BuildRequires: gimp +BuildRequires: gimp-devel +BuildRequires: intltool +BuildRequires: pkgconfig(glib-2.0) BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -48,28 +31,24 @@ The package includes: - various plugins (in Python language) that call the resynthesizer engine %prep -%setup -n bootchk-resynthesizer-%{gitrev} -# automake12.diff -%patch1 -p1 +%setup -n resynthesizer-master %build ./autogen.sh %configure -env SUSE_ASNEEDED=0 make %{?_smp_mflags} CFLAGS="-lm -lgthread-2.0 $CFLAGS" +make %{?_smp_mflags} %install %make_install %find_lang resynthesizer %clean -%{?buildroot:%__rm -rf "%{buildroot}"} +rm -rf %{buildroot} %files -f resynthesizer.lang %defattr(-,root,root) -%doc ChangeLog README COPYING +%doc AUTHORS COPYING ChangeLog NEWS README %{_libdir}/gimp/2.0/plug-ins/* -%dir %{_datadir}/resynthesizer -%{_datadir}/resynthesizer/* +%{_datadir}/resynthesizer/ %changelog - diff --git a/resynthesizer-23dced0908.tar.gz b/resynthesizer-23dced0908.tar.gz new file mode 100644 index 0000000..c9f9e6e --- /dev/null +++ b/resynthesizer-23dced0908.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:565365090a79ba72228468b0fcd7dde2e998d6fc5d3b0fee63d8d0838825fcf9 +size 11176537