From 6799258910f673719fc104ec94551e52813d6123fe261971f440ad8af8d37a0e Mon Sep 17 00:00:00 2001
From: Petr Gajdos <pgajdos@suse.com>
Date: Mon, 3 Oct 2011 07:56:08 +0000
Subject: [PATCH] - Make rpmlint more happy.

OBS-URL: https://build.opensuse.org/package/show/M17N/fontforge?expand=0&rev=17
---
 fontforge-python-module-name.diff | 34 +++++++++++++++++++++++++++++++
 fontforge.changes                 |  5 +++++
 fontforge.spec                    | 15 ++++++--------
 3 files changed, 45 insertions(+), 9 deletions(-)
 create mode 100644 fontforge-python-module-name.diff

diff --git a/fontforge-python-module-name.diff b/fontforge-python-module-name.diff
new file mode 100644
index 0000000..c438b36
--- /dev/null
+++ b/fontforge-python-module-name.diff
@@ -0,0 +1,34 @@
+--- pyhook/setup.py.in	2011-10-03 09:42:46.000000000 +0200
++++ pyhook/setup.py.in	2011-10-03 09:43:39.000000000 +0200
+@@ -4,16 +4,16 @@ from distutils.sysconfig import get_conf
+ 
+ if float(get_config_var('VERSION')) < 3:
+ 
+-    setup(name='fontforge',
++    setup(name='python-fontforge',
+         version='1.0',
+         description='font manipulation module',
+         author='George Williams',
+         url='http://fontforge.sf.net/',
+-        ext_modules=[Extension('fontforge',['fontforgepyhook.c'],
++        ext_modules=[Extension('python-fontforge',['fontforgepyhook.c'],
+                 include_dirs=[@PYINCLUDE@],
+                 define_macros=[@PYDEFINES@],
+                 libraries=[@PYLIBS@]),
+-            Extension('psMat',['psMatpyhook.c'],
++            Extension('python-psMat',['psMatpyhook.c'],
+                 include_dirs=[@PYINCLUDE@],
+                 define_macros=[@PYDEFINES@],
+                 libraries=[@PYLIBS@])]
+@@ -28,8 +28,8 @@ else:
+     so_ext = get_config_var('SO')
+     py_libdir = get_python_lib(prefix = '@PYPREFIX@')
+     libfontforge_so = join('@libdir@', 'libfontforge' + so_ext)
+-    fontforge_so = join(py_libdir, 'fontforge' + so_ext)
+-    psMat_so = join(py_libdir, 'psMat' + so_ext)
++    fontforge_so = join(py_libdir, 'python-fontforge' + so_ext)
++    psMat_so = join(py_libdir, 'python-psMat' + so_ext)
+ 
+     if hasattr(os, 'symlink'):
+         link = 'sym'
+
diff --git a/fontforge.changes b/fontforge.changes
index 4826d9e..4b3b3d4 100644
--- a/fontforge.changes
+++ b/fontforge.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Oct  3 07:55:35 UTC 2011 - pgajdos@suse.com
+
+- Make rpmlint more happy.
+
 -------------------------------------------------------------------
 Sun Sep 18 17:17:12 UTC 2011 - jengelh@medozas.de
 
diff --git a/fontforge.spec b/fontforge.spec
index 29a7d98..251a85f 100644
--- a/fontforge.spec
+++ b/fontforge.spec
@@ -15,14 +15,16 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
+
+
 Name:           fontforge
 BuildRequires:  dos2unix freetype2-devel giflib-devel libpng-devel libtiff-devel libxml2-devel python-devel update-desktop-files xorg-x11-devel
 License:        BSD3c(or similar)
 Group:          Productivity/Graphics/Vector Editors
-Obsoletes:      PfaEdit
-Provides:       PfaEdit
 Version:        20110222
 Release:        1
+Obsoletes:      PfaEdit < 20110222
+Provides:       PfaEdit = %{version}
 Url:            http://fontforge.sourceforge.net/
 Source0:        http://dfn.dl.sourceforge.net/sourceforge/fontforge/fontforge_full-%{version}.tar.bz2
 Source1:        http://sourceforge.net/projects/fontforge/files/fontforge-docs/fontforge_htdocs-20110221.tar.bz2
@@ -37,6 +39,7 @@ Patch4:         libpng14.diff
 # fontforge.py27.diff upstreamed from 20110222
 Patch5:         fontforge.py27.diff  
 Patch6:         libpng14-dynamic.diff
+Patch7:         fontforge-python-module-name.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Summary:        A Font Editor
 
@@ -76,6 +79,7 @@ to develop applications that require these.
 %if %suse_version > 1120
 %patch6
 %endif
+%patch7
 mkdir docs
 tar -jxvf %{S:1} -C docs
 tar -jxvf %{S:2} -C docs
@@ -100,13 +104,6 @@ python setup.py build
 popd
 
 %install
-# mkdir -p ${RPM_BUILD_ROOT}{%{_bindir},%{_libdir},%{_mandir}/man1,/usr/share/fontforge}
-# make -e bindir=$RPM_BUILD_ROOT/usr/bin \
-#         sharedir=$RPM_BUILD_ROOT/usr/share/fontforge \
-# 	libdir=$RPM_BUILD_ROOT%{_libdir} \
-# 	mandir=$RPM_BUILD_ROOT%{_mandir} \
-# 	localedir=$RPM_BUILD_ROOT/usr/share/locale \
-# 	install
 make DESTDIR=$RPM_BUILD_ROOT install
 pushd $RPM_BUILD_ROOT/usr/bin
     ln -s fontforge pfaedit