[nip2] 7.30.1

Benjamin Gilbert bgilbert at fedoraproject.org
Mon Oct 15 05:30:10 UTC 2012


commit 3cba5abf6db37cc8667018c394ca220cd4d2b5fe
Author: Benjamin Gilbert <bgilbert at backtick.net>
Date:   Mon Oct 15 01:29:32 2012 -0400

    7.30.1

 .gitignore |    3 +--
 nip2.spec  |   27 ++++++++++-----------------
 sources    |    2 +-
 3 files changed, 12 insertions(+), 20 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0d17468..ec17dc9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
-/nip2-7.26.4.tar.gz
-/nip2-7.28.1.tar.gz
+/nip2-7.30.1.tar.gz
diff --git a/nip2.spec b/nip2.spec
index e3f6d32..53a04b0 100644
--- a/nip2.spec
+++ b/nip2.spec
@@ -1,19 +1,18 @@
 Name:		nip2
-Version:	7.28.1
-Release:	3%{?dist}
+Version:	7.30.1
+Release:	1%{?dist}
 Summary:	Interactive tool for working with large images
 
 Group:		Applications/Multimedia
 License:	GPLv2+
 URL:		http://www.vips.ecs.soton.ac.uk/
-Source0:	http://www.vips.ecs.soton.ac.uk/supported/7.28/%{name}-%{version}.tar.gz
+Source0:	http://www.vips.ecs.soton.ac.uk/supported/7.30/%{name}-%{version}.tar.gz
 Patch0:		nip2-7.20.7-guidedir.patch
 
-BuildRequires:	pkgconfig(vips-7.28)
+BuildRequires:	pkgconfig(vips)
 BuildRequires:	pkgconfig(gtk+-2.0)
 BuildRequires:	pkgconfig(libxml-2.0)
-# TODO: Re-enable when nip2 is ported to GTK3
-# BuildRequires:	pkgconfig(libgoffice-0.10)
+BuildRequires:	pkgconfig(libgoffice-0.8)
 BuildRequires:	pkgconfig(fftw3)
 BuildRequires:	pkgconfig(libgvc)
 BuildRequires:	pkgconfig(gsl)
@@ -41,11 +40,6 @@ GIMP should be used instead.
 # fix location of help in program to look in correct path
 %patch0 -p1 -b .guidedir
 
-# CVS dirs
-find . -name CVS -type d -print0 | xargs -0 rm -rf
-
-# fix goffice configure check
-# sed -i 's|libgoffice-0.8|libgoffice-0.10|g' configure
 
 %build
 %configure --disable-update-desktop
@@ -58,12 +52,6 @@ make install DESTDIR=$RPM_BUILD_ROOT
 # delete doc (we will get it later)
 rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/nip2
 
-# the nip2 post install hook seems to run update-mime-database, but we
-# need to run it in post
-rm -rf $RPM_BUILD_ROOT%{_datadir}/mime
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/mime/packages
-cp -a nip2.xml $RPM_BUILD_ROOT%{_datadir}/mime/packages
-
 # locale stuff
 %find_lang nip2
 
@@ -116,6 +104,11 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
 
 
 %changelog
+* Mon Oct 15 2012 Benjamin Gilbert <bgilbert at backtick.net> - 7.30.1-1
+- New release
+- Switch back to goffice 0.8 for gtk2
+- Minor specfile cleanups
+
 * Fri Jul 20 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 7.28.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
diff --git a/sources b/sources
index 7433043..d60f9ab 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c20c594a2d71a5f2b21a9ca0526635af  nip2-7.28.1.tar.gz
+8e58d331cc2f428f083eed65b418705f  nip2-7.30.1.tar.gz


More information about the scm-commits mailing list