[inkscape] - New upstream release - Drop el5 support

[Lubomir Rintel]

commit fb38c6d185e18c61f3112acc088799af359c9080
Author: Lubomir Rintel <lkundrak at v3.sk>
Date:   Thu Aug 26 10:42:42 2010 +0200

    - New upstream release
    - Drop el5 support

 .gitignore                         |    1 +
 inkscape-0.47-x11.patch            |   16 -----
 inkscape-0.48-el5.patch            |  113 ------------------------------------
 inkscape-0.48-newpoppler.patch     |   72 -----------------------
 inkscape-0.48.0-types.patch        |   26 ++++++++
 inkscape-20090410svn-formats.patch |   16 -----
 inkscape-20091101svn-icon.patch    |   21 -------
 inkscape.spec                      |   43 ++++----------
 sources                            |    2 +-
 9 files changed, 39 insertions(+), 271 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8a94dbb..5d6340f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 inkscape.tar.bz2
+/inkscape-0.48.0.tar.bz2
diff --git a/inkscape-0.48.0-types.patch b/inkscape-0.48.0-types.patch
new file mode 100644
index 0000000..df3b763
--- /dev/null
+++ b/inkscape-0.48.0-types.patch
@@ -0,0 +1,26 @@
+From d30b1aeacddd15c3870d0933b4ff5a33320894fd Mon Sep 17 00:00:00 2001
+From: Lubomir Rintel <lkundrak at v3.sk>
+Date: Thu, 26 Aug 2010 08:33:05 +0200
+Subject: [PATCH] Add more supported mime/types
+
+https://bugzilla.redhat.com/show_bug.cgi?id=458845
+---
+ inkscape.desktop.in |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/inkscape.desktop.in b/inkscape.desktop.in
+index bd2478e..f663942 100644
+--- a/inkscape.desktop.in
++++ b/inkscape.desktop.in
+@@ -6,7 +6,7 @@ _X-GNOME-FullName=Inkscape Vector Graphics Editor
+ _Comment=Create and edit Scalable Vector Graphics images
+ Type=Application
+ Categories=Graphics;VectorGraphics;GTK;
+-MimeType=image/svg+xml;image/svg+xml-compressed;
++MimeType=image/svg+xml;image/svg+xml-compressed;image/cgm;image/x-wmf;application/vnd.corel-draw;application/x-xccx;application/x-xcgm;application/x-xcdt;application/x-xsk1;application/x-xcmx;image/x-xcdr;
+ Exec=inkscape %F
+ TryExec=inkscape
+ Terminal=false
+-- 
+1.7.2.1
+
diff --git a/inkscape.spec b/inkscape.spec
index 29832b7..d4d6993 100644
--- a/inkscape.spec
+++ b/inkscape.spec
@@ -1,24 +1,13 @@
 Name:           inkscape
-Version:        0.48
-Release:        0.5.20100505bzr%{?dist}
+Version:        0.48.0
+Release:        1%{?dist}
 Summary:        Vector-based drawing program using SVG
 
 Group:          Applications/Productivity
 License:        GPLv2+
 URL:            http://inkscape.sourceforge.net/
-# bzr branch lp:inkscape
-# cd inkscape
-# bzr export -r9395 ../inkscape.tar.bz2
-Source0:        inkscape.tar.bz2
-#Source0:        http://download.sourceforge.net/inkscape/%{name}-%{version}.tar.bz2
-
-Patch4:         inkscape-20090410svn-formats.patch
-Patch5:         inkscape-0.48-el5.patch
-Patch6:         inkscape-20091101svn-icon.patch
-Patch7:         inkscape-0.48-newpoppler.patch
-Patch8:         inkscape-0.47-x11.patch
-
-BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+Source0:        http://download.sourceforge.net/inkscape/%{name}-%{version}.tar.bz2
+Patch0:         inkscape-0.48.0-types.patch
 
 # Do not bother building this desktop app on s390*
 ExcludeArch: s390 s390x
@@ -48,14 +37,7 @@ BuildRequires:  ImageMagick-c++-devel
 BuildRequires:  perl(XML::Parser)
 BuildRequires:  perl(ExtUtils::Embed)
 BuildRequires:  intltool
-# A packaging bug in EL-5
-%if 0%{?fedora} > 6 || 0%{?rhel} > 5
 BuildRequires:  popt-devel
-%else
-BuildRequires:  popt
-%endif
-BuildRequires:  autoconf
-BuildRequires:  automake
 
 # Disable all for now. TODO: Be smarter
 %if 0
@@ -134,18 +116,14 @@ graphics in W3C standard Scalable Vector Graphics (SVG) file format.
 
 
 %prep
-%setup -q -n %{name}
-%patch4 -p1 -b .formats
-%patch5 -p1 -b .el5
-%patch6 -p0 -b .japierdole
-%patch7 -p1 -b .poppler
-%patch8 -p1 -b .x11
+%setup -q
+%patch0 -p1 -b .types
 
 # https://bugs.launchpad.net/inkscape/+bug/314381
 # A couple of files have executable bits set,
 # despite not being executable
 (find . \( -name '*.cpp' -o -name '*.h' \) -perm +111
-	find share/extensions -name '*.py' -perm +111
+        find share/extensions -name '*.py' -perm +111
 ) |xargs chmod -x
 
 # Fix end of line encodings
@@ -153,8 +131,6 @@ dos2unix -k -q share/extensions/*.py
 
 
 %build
-autoreconf -i
-intltoolize --automake
 %configure                      \
         --with-python           \
         --with-perl             \
@@ -170,7 +146,6 @@ make %{?_smp_mflags}
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
 
 desktop-file-install --vendor fedora --delete-original  \
         --dir $RPM_BUILD_ROOT%{_datadir}/applications   \
@@ -253,6 +228,10 @@ fi
 
 
 %changelog
+* Wed Aug 25 2010 Lubomir Rintel <lkundrak at v3.sk> - 0.48.0-1
+- New upstream release
+- Drop el5 support
+
 * Thu Aug 19 2010 Rex Dieter <rdieter at fedoraproject.org> - 0.48-0.5.20100505bzr
 - rebuild (poppler)
 
diff --git a/sources b/sources
index 85045a0..828bcfc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-bfca16366e0f6fca9f69acd70b0c4195  inkscape.tar.bz2
+fd8b17a3f06668603807176a77167bb9  inkscape-0.48.0.tar.bz2