rpms/nip2/devel nip2-7.12.0-guidedir.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 nip2.desktop, 1.2, 1.3 nip2.spec, 1.3, 1.4 sources, 1.4, 1.5 nip2-7.10.20-guidedir.patch, 1.1, NONE
Adam Goode (agoode)
fedora-extras-commits at redhat.com
Sat May 5 22:40:41 UTC 2007
Author: agoode
Update of /cvs/extras/rpms/nip2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11248
Modified Files:
.cvsignore nip2.desktop nip2.spec sources
Added Files:
nip2-7.12.0-guidedir.patch
Removed Files:
nip2-7.10.20-guidedir.patch
Log Message:
update
nip2-7.12.0-guidedir.patch:
--- NEW FILE nip2-7.12.0-guidedir.patch ---
diff -ur nip2-7.12.0~/src/ip.h nip2-7.12.0/src/ip.h
--- nip2-7.12.0~/src/ip.h 2007-04-11 16:43:45.000000000 -0400
+++ nip2-7.12.0/src/ip.h 2007-05-05 16:31:10.000000000 -0400
@@ -175,11 +175,11 @@
#define MAX_TRACE (1024) /* Biggest thing we print in trace */
#define MAX_SSTACK (40) /* Scope stack for parser */
#define VIPS_HOMEPAGE "http://www.vips.ecs.soton.ac.uk"
+#define IP_NAME PACKAGE "-" VERSION
#define NIP_DOCPATH "$VIPSHOME" G_DIR_SEPARATOR_S "share" G_DIR_SEPARATOR_S \
- "doc" G_DIR_SEPARATOR_S PACKAGE G_DIR_SEPARATOR_S "html"
+ "doc" G_DIR_SEPARATOR_S IP_NAME G_DIR_SEPARATOR_S "html"
#define VIPS_DOCPATH "$VIPSHOME" G_DIR_SEPARATOR_S "share" G_DIR_SEPARATOR_S \
"doc" G_DIR_SEPARATOR_S "vips" G_DIR_SEPARATOR_S "html"
-#define IP_NAME PACKAGE "-" VERSION
#define NAMESPACE VIPS_HOMEPAGE "/" "nip"
/* XML namespace ... note, not nip2! */
#define MAX_LINELENGTH (120) /* Max chars we display of value */
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nip2/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 1 Sep 2006 09:33:39 -0000 1.4
+++ .cvsignore 5 May 2007 22:40:06 -0000 1.5
@@ -1 +1 @@
-nip2-7.10.21.tar.gz
+nip2-7.12.0a.tar.gz
Index: nip2.desktop
===================================================================
RCS file: /cvs/extras/rpms/nip2/devel/nip2.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- nip2.desktop 14 Aug 2006 15:09:48 -0000 1.2
+++ nip2.desktop 5 May 2007 22:40:06 -0000 1.3
@@ -7,4 +7,3 @@
Icon=nip2.png
Terminal=false
Categories=Graphics;
-Version=7.10.20
Index: nip2.spec
===================================================================
RCS file: /cvs/extras/rpms/nip2/devel/nip2.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- nip2.spec 1 Sep 2006 09:33:39 -0000 1.3
+++ nip2.spec 5 May 2007 22:40:06 -0000 1.4
@@ -1,18 +1,19 @@
Name: nip2
-Version: 7.10.21
+Version: 7.12.0
Release: 1%{?dist}
Summary: Interactive tool for working with large images
Group: Applications/Multimedia
License: GPL
URL: http://www.vips.ecs.soton.ac.uk/
-Source0: http://www.vips.ecs.soton.ac.uk/vips-7.10/%{name}-%{version}.tar.gz
+Source0: http://www.vips.ecs.soton.ac.uk/vips-7.11/%{name}-%{version}a.tar.gz
Source1: nip2.desktop
-Patch1: nip2-7.10.20-guidedir.patch
+Patch1: nip2-7.12.0-guidedir.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: vips-devel gtk2-devel shared-mime-info gnome-icon-theme
+BuildRequires: vips-devel >= 7.11
+BuildRequires: gtk2-devel shared-mime-info gnome-icon-theme
BuildRequires: flex bison intltool fftw-devel libxml2-devel gettext
BuildRequires: desktop-file-utils
#Requires:
@@ -48,25 +49,30 @@
make install DESTDIR=$RPM_BUILD_ROOT
# delete doc (we will get it later with %doc)
-rm -rf ${RPM_BUILD_ROOT}%{_datadir}/doc/nip2
+rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/nip2
# malkovich??
-rm -rf ${RPM_BUILD_ROOT}%{_datadir}/locale/malkovich
+rm -rf $RPM_BUILD_ROOT%{_datadir}/locale/malkovich
# locale stuff
%find_lang nip2
# icon
-install -d ${RPM_BUILD_ROOT}%{_datadir}/icons/hicolor/128x128/apps
+install -d $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/128x128/apps
cp -a share/nip2/data/vips-128.png \
- ${RPM_BUILD_ROOT}%{_datadir}/icons/hicolor/128x128/apps/nip2.png
+ $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/128x128/apps/nip2.png
# desktop file
desktop-file-install --vendor fedora \
- --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \
- --add-category X-Fedora \
+ --dir $RPM_BUILD_ROOT%{_datadir}/applications \
%{SOURCE1}
+# 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
+
%post
# scriptlet for icons
@@ -78,6 +84,9 @@
# scriptlet for desktop database
update-desktop-database &> /dev/null || :
+# MIME
+update-mime-database %{_datadir}/mime &> /dev/null || :
+
%postun
# scriptlet for icons
@@ -89,6 +98,9 @@
# scriptlet for desktop database
update-desktop-database &> /dev/null || :
+# MIME
+update-mime-database %{_datadir}/mime &> /dev/null || :
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -103,6 +115,7 @@
%{_mandir}/man1/nip2.1.gz
%{_datadir}/icons/hicolor/*/apps/*
%{_datadir}/applications/*
+%{_datadir}/mime/packages/nip2.xml
%changelog
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nip2/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 1 Sep 2006 09:33:39 -0000 1.4
+++ sources 5 May 2007 22:40:06 -0000 1.5
@@ -1 +1 @@
-25ab1f179c350d43746b66c90156013e nip2-7.10.21.tar.gz
+4c28d22b592fe8876920f6fc73b6d79b nip2-7.12.0a.tar.gz
--- nip2-7.10.20-guidedir.patch DELETED ---
More information about the fedora-extras-commits
mailing list