rpms/mtpaint/F-7 mtpaint-3.19-openjpeg.patch, NONE, 1.1 mtpaint-3.19-xdg-open.patch, NONE, 1.1 mtpaint.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

[Terje Røsten (terjeros)]

Author: terjeros

Update of /cvs/extras/rpms/mtpaint/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22986/F-7

Modified Files:
	.cvsignore sources 
Added Files:
	mtpaint-3.19-openjpeg.patch mtpaint-3.19-xdg-open.patch 
	mtpaint.spec 
Log Message:
Importing mtpaint: F-7 F-8.



mtpaint-3.19-openjpeg.patch:

--- NEW FILE mtpaint-3.19-openjpeg.patch ---
--- mtpaint-3.19/src/png.c~	2007-11-11 16:48:32.000000000 +0100
+++ mtpaint-3.19/src/png.c	2007-12-17 00:14:39.000000000 +0100
@@ -34,7 +34,7 @@
 #include <jpeglib.h>
 #endif
 #ifdef U_JP2
-#include <openjpeg.h>
+#include <openjpeg/openjpeg.h>
 #endif
 #ifdef U_TIFF
 #include <tiffio.h>

mtpaint-3.19-xdg-open.patch:

--- NEW FILE mtpaint-3.19-xdg-open.patch ---
--- mtpaint-3.19/src/png.c~	2007-11-11 16:48:32.000000000 +0100
+++ mtpaint-3.19/src/png.c	2007-12-16 23:33:19.000000000 +0100
@@ -3990,7 +3990,7 @@
 
 #else /* Linux */
 
-#define HANDBOOK_BROWSER "firefox"
+#define HANDBOOK_BROWSER "xdg-open"
 #define HANDBOOK_LOCATION "/usr/doc/mtpaint/index.html"
 #define HANDBOOK_LOCATION2 "/usr/share/doc/mtpaint/index.html"
 


--- NEW FILE mtpaint.spec ---
%define docver 3.20

Summary:       Painting program for creating icons and pixel-based artwork
Name:          mtpaint
Version:       3.20
Release:       2%{?dist}
License:       GPLv3+
Group:         Applications/Multimedia
URL:           http://mtpaint.sourceforge.net/
Source:        http://downloads.sf.net/%{name}/%{name}-%{version}.tar.bz2
Source1:       http://downloads.sf.net/%{name}/%{name}_handbook-%{docver}.zip
Patch:         %{name}-3.19-xdg-open.patch
Patch1:        %{name}-3.19-openjpeg.patch
BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gtk2-devel zlib-devel
BuildRequires: libpng-devel giflib-devel libjpeg-devel libtiff-devel
BuildRequires: desktop-file-utils gettext dos2unix

%description 
mtPaint is a simple painting program designed for creating icons and
pixel-based artwork. It can edit indexed palette or 24 bit RGB images
and offers basic painting and palette manipulation tools. Its main
file format is PNG, although it can also handle JPEG, GIF, TIFF, BMP,
XPM, and XBM files.

%package handbook
Summary:  Handbook for the mtpaint painting application
Group:    Applications/Multimedia
License:  GFDL
Requires: %{name} = %{version}-%{release}

%description handbook
Install this package is want to read the handbook for the painting
application mtpaint.

%prep
%setup -q -a 1
%patch -p1
%patch1 -p1

# We have moved docs
%{__sed} -i 's,#define HANDBOOK_LOCATION "/usr/doc/mtpaint/index.html",#define HANDBOOK_LOCATION "%{_docdir}/%{name}-handbook-%{version}/index.html",' src/png.c

%{__chmod} 0755 %{name}_handbook-%{docver}/docs/{en_GB,img,files,cs}
dos2unix -k %{name}_handbook-%{docver}/docs/index.html
dos2unix -k %{name}_handbook-%{docver}/docs/{en_GB,cs}/*.html

%build
# This is not a "normal" configure
%configure cflags asneeded debug intl man gtk2 tiff jpeg GIF
%{__make} %{?_smp_mflags}

%install
%{__rm} -rf %{buildroot}
%{__make} install MT_PREFIX=%{buildroot}%{_prefix}            \
                  MT_MAN_DEST=%{buildroot}%{_mandir}/man1     \
                  MT_LANG_DEST=%{buildroot}%{_datadir}/locale \
                  BIN_INSTALL=%{buildroot}%{_bindir}

desktop-file-install --delete-original         \
    --vendor fedora                            \
    --dir %{buildroot}%{_datadir}/applications \
    %{buildroot}%{_datadir}/applications/%{name}.desktop
%find_lang %{name}

%clean
%{__rm} -rf %{buildroot}

%post
touch --no-create %{_datadir}/icons/hicolor
if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
fi
if [ -x %{_bindir}/update-desktop-database ] ; then
  %{_bindir}/update-desktop-database &> /dev/null
fi
exit 0

%postun
touch --no-create %{_datadir}/icons/hicolor 
if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
fi
if [ -x %{_bindir}/update-desktop-database ] ; then
  %{_bindir}/update-desktop-database &> /dev/null
fi
exit 0

%files -f %{name}.lang
%defattr(-, root, root, -)
%doc COPYING NEWS README
%{_mandir}/man1/%{name}*
%{_bindir}/%{name}
%{_datadir}/applications/*.desktop
%{_datadir}/pixmaps/%{name}.png

%files handbook
%doc %{name}_handbook-%{docver}/COPYING %{name}_handbook-%{docver}/docs/*

%changelog
* Wed Jan 23 2008 Terje Rosten <terje.rosten at ntnu.no> - 3.20-2
- Unzip by %%setup
- Simplify %%post/postun
- Added COPYING to handbook

* Sat Dec 29 2007 Terje Rosten <terje.rosten at ntnu.no> - 3.20-1
- 3.20
- include patch now upstream
- handbook patch now upstream

* Wed Dec 19 2007 Terje Rosten <terje.rosten at ntnu.no> - 3.20-0.1.rc2
- 3.20RC2
- disable openjpeg support
- icon and desktop file now upstream

* Sun Dec 16 2007 Terje Rosten <terje.rosten at ntnu.no> - 3.19-1
- upgrade to 3.19
- misc fixes to be rpmlint clean
- fix debuginfo package
- handle translations
- fix license
- compile with correct flags
- add patch to compile
- add handbook subpackage (and fix app to find docs)
- add xdg-open patch
- dont' use %%makeinstall
- add icon and mimetypes to desktop file

* Mon Apr 16 2007 Dries Verachtert <dries at ulyssis.org> - 3.11-1 - 5280/dries
- Updated to release 3.11.

* Sun Nov 12 2006 Dries Verachtert <dries at ulyssis.org> - 3.02-1
- Updated to release 3.02.

* Mon Aug 07 2006 Dries Verachtert <dries at ulyssis.org> - 3.01-1
- Updated to release 3.01.

* Wed May 31 2006 Dries Verachtert <dries at ulyssis.org> - 2.31-1
- Updated to release 2.31.

* Sat Apr 08 2006 Dries Verachtert <dries at ulyssis.org> - 2.30-1.2
- Rebuild for Fedora Core 5.

* Wed Mar 01 2006 Dries Verachtert <dries at ulyssis.org> - 2.30-1
- Updated to release 2.30.

* Sun Jan 01 2006 Dries Verachtert <dries at ulyssis.org> - 2.20-1
- Updated to release 2.20.

* Mon Nov 21 2005 Dries Verachtert <dries at ulyssis.org> - 2.10-1
- Updated to release 2.10.

* Sat Sep 24 2005 Dries Verachtert <dries at ulyssis.org> - 2.03-1
- Updated to release 2.03.

* Tue Sep 20 2005 Dries Verachtert <dries at ulyssis.org> - 2.02-1
- Initial package.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mtpaint/F-7/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	24 Jan 2008 22:23:02 -0000	1.1
+++ .cvsignore	25 Jan 2008 16:49:03 -0000	1.2
@@ -0,0 +1,2 @@
+mtpaint-3.20.tar.bz2
+mtpaint_handbook-3.20.zip


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mtpaint/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	24 Jan 2008 22:23:02 -0000	1.1
+++ sources	25 Jan 2008 16:49:03 -0000	1.2
@@ -0,0 +1,2 @@
+772f96288f6dc7c78597e4878fc68597  mtpaint-3.20.tar.bz2
+e3022cd9d7a97cae12c198ce0e526fdc  mtpaint_handbook-3.20.zip