From 5461b08fa134fc4d67ed62e18ceb1c4df21b1df4ab6c34face9b5981930d6e91 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Sat, 4 Aug 2012 07:12:03 +0000 Subject: [PATCH] Accepting request 128801 from GNOME:Apps Update to ver 2.1.0 (forwarded request 128694 from dimstar) OBS-URL: https://build.opensuse.org/request/show/128801 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gimp-dds?expand=0&rev=3 --- gimp-dds-2.0.9+svn20120425_175.tar.bz2 | 3 --- gimp-dds-2.1.0.tar.bz2 | 3 +++ gimp-dds-fix-incorrect-fsf-address.patch | 25 ------------------------ gimp-dds-fix-linker.patch | 21 -------------------- gimp-dds.changes | 13 ++++++++++++ gimp-dds.spec | 13 +++--------- 6 files changed, 19 insertions(+), 59 deletions(-) delete mode 100644 gimp-dds-2.0.9+svn20120425_175.tar.bz2 create mode 100644 gimp-dds-2.1.0.tar.bz2 delete mode 100644 gimp-dds-fix-incorrect-fsf-address.patch delete mode 100644 gimp-dds-fix-linker.patch diff --git a/gimp-dds-2.0.9+svn20120425_175.tar.bz2 b/gimp-dds-2.0.9+svn20120425_175.tar.bz2 deleted file mode 100644 index 698afcc..0000000 --- a/gimp-dds-2.0.9+svn20120425_175.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1d4556c94fef6c41f84ddb991e742dc603e8bf4a460103e53501f0386b3f56d8 -size 937928 diff --git a/gimp-dds-2.1.0.tar.bz2 b/gimp-dds-2.1.0.tar.bz2 new file mode 100644 index 0000000..179dd7f --- /dev/null +++ b/gimp-dds-2.1.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:307de8a7e1f2374c88e8b2a628dfa96ac9ea35ab1a0b6afac916bc7358676af0 +size 467193 diff --git a/gimp-dds-fix-incorrect-fsf-address.patch b/gimp-dds-fix-incorrect-fsf-address.patch deleted file mode 100644 index da4138e..0000000 --- a/gimp-dds-fix-incorrect-fsf-address.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -Naur a/COPYING b/COPYING ---- a/COPYING 2012-04-14 10:41:07.499731273 -0500 -+++ b/COPYING 2012-04-14 14:00:42.240225085 -0500 -@@ -2,7 +2,7 @@ - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc. -- 59 Temple Place, Suite 330, Boston, MA 02111 USA -+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - -diff -Naur a/LICENSE b/LICENSE ---- a/LICENSE 2012-04-14 10:41:07.475731271 -0500 -+++ b/LICENSE 2012-04-14 14:01:12.376226328 -0500 -@@ -16,7 +16,7 @@ - - You should have received a copy of the GNU General Public License - along with this program; see the file COPYING. If not, write to -- the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -- Boston, MA 02111-1307, USA. -+ the Free Software Foundation, 51 Franklin Street, Fifth Floor, -+ Boston, MA 02110-1301 USA. - */ - diff --git a/gimp-dds-fix-linker.patch b/gimp-dds-fix-linker.patch deleted file mode 100644 index ed9a3c6..0000000 --- a/gimp-dds-fix-linker.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -Naur a/Makefile b/Makefile ---- a/Makefile 2012-04-14 10:41:07.499731273 -0500 -+++ b/Makefile 2012-04-14 13:11:30.732103374 -0500 -@@ -2,7 +2,7 @@ - GIMPTOOL=gimptool-2.0 - - CC=gcc --CFLAGS=-pipe -g -O2 -Wall $(shell pkg-config --cflags gtk+-2.0 gimp-2.0) -+CFLAGS=-pipe -g $(RPM_OPT_FLAGS) $(shell pkg-config --cflags gtk+-2.0 gimp-2.0) - - OS=$(shell uname -s) - ifeq ($(OS), Linux) -@@ -21,7 +21,7 @@ - all: $(TARGET) - - $(TARGET): $(OBJS) -- $(CC) $(LDFLAGS) $(OBJS) $(LIBS) -o $(TARGET) -+ $(CC) $(LDFLAGS) $(OBJS) $(LIBS) -lm -o $(TARGET) - - clean: - rm -f *.o $(TARGET) diff --git a/gimp-dds.changes b/gimp-dds.changes index 60cba50..3e03422 100644 --- a/gimp-dds.changes +++ b/gimp-dds.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Sun Jul 22 13:06:29 UTC 2012 - zaitor@opensuse.org + +- Update to version 2.1.0: + + GIMP 2.8 support. + + DXT compression quality enhancements. + + Various bug fixes. + + Support for saving existing mipmap chain (2D images only). +- Drop gimp-dds-fix-linker.patch, a variation of this has been + applied upstream. +- Drop gimp-dds-fix-incorrect-fsf-address.patch, fixed upstream. +- Change to release tarball instead of svn checkout. + ------------------------------------------------------------------- Sat Apr 14 19:22:49 UTC 2012 - malcolmlewis@opensuse.org diff --git a/gimp-dds.spec b/gimp-dds.spec index eaada7f..2fa3399 100644 --- a/gimp-dds.spec +++ b/gimp-dds.spec @@ -18,18 +18,13 @@ Name: gimp-dds -Version: 2.0.9+svn20120425_175 +Version: 2.1.0 Release: 0 Summary: Plugin for GIMP providing support for the DDS format License: GPL-2.0+ Group: Productivity/Graphics/Bitmap Editors Url: http://code.google.com/p/gimp-dds/ -# Source0 pulled via svn checkout http://gimp-dds.googlecode.com/svn/trunk/ gimp-dds -Source0: %{name}-%{version}.tar.bz2 -# PATCH-FIX-UPSTREAM gimp-dds-fix-linker.patch malcolmlewis@opensuse.org -- Fix linker and optflags when building. http://code.google.com/p/gimp-dds/issues/detail?id=13 -Patch0: gimp-dds-fix-linker.patch -# PATCH-FIX-UPSTREAM gimp-dds-fix-incorrect-fsf-address.patch malcolmlewis@opensuse.org -- Fix incorrect FSF address http://code.google.com/p/gimp-dds/issues/detail?id=14 -Patch1: gimp-dds-fix-incorrect-fsf-address.patch +Source0: http://gimp-dds.googlecode.com/files/%{name}-%{version}.tar.bz2 BuildRequires: gimp-devel >= 2.6 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -63,9 +58,7 @@ DDS plugin: + Saving volume map images %prep -%setup -q -n %{name} -%patch0 -p1 -%patch1 -p1 +%setup %build make %{?_smp_mflags}