[luma/f18] New upstream release

[Jochen Schmitt]

commit 996172011f19541710c6e24494a08184995a2ece
Author: Jochen Schmitt <Jochen at herr-schmitt.de>
Date:   Tue Oct 2 22:01:00 2012 +0200

    New upstream release

 .gitignore               |    1 +
 luma-2.3-plugins.patch   |   11 -----
 luma-2.3-smd5.patch      |   11 -----
 luma-2.4-extspc.patch    |   36 -----------------
 luma-3.0.7-desktop.patch |   18 ++++++++
 luma.spec                |   98 ++++++++++-----------------------------------
 sources                  |    2 +-
 7 files changed, 42 insertions(+), 135 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6dc3481..23bf6b8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 luma-2.4.tar.bz2
+/luma-3.0.7.tar.gz
diff --git a/luma-3.0.7-desktop.patch b/luma-3.0.7-desktop.patch
new file mode 100644
index 0000000..ec8e96b
--- /dev/null
+++ b/luma-3.0.7-desktop.patch
@@ -0,0 +1,18 @@
+diff -up luma-3.0.7/data/luma.desktop.dsk luma-3.0.7/data/luma.desktop
+--- luma-3.0.7/data/luma.desktop.dsk	2011-05-15 16:30:34.000000000 +0200
++++ luma-3.0.7/data/luma.desktop	2012-10-02 21:30:37.624000001 +0200
+@@ -1,13 +1,11 @@
+ [Desktop Entry]
+-Version=3.0.3
+ Comment=LDAP browser and administration utility
+ Exec=luma %U
+ Icon=luma
+ Terminal=false
+ Type=Application
+-Encoding=UTF-8
+ StartupNotify=true
+-Categories=Application;System;
++Categories=System;
+ Name=Luma LDAP Browser
+ Name[af]=Luma LDAP Leser
+ Name[ar]=Luma LDAP متصفح
diff --git a/luma.spec b/luma.spec
index a21c77b..873e6c3 100644
--- a/luma.spec
+++ b/luma.spec
@@ -1,35 +1,27 @@
-%define lumadata %{_datadir}/luma
-%define lumalib %{lumadata}/lib
-%define plugins %{lumalib}/plugins
-
 Name:		luma
-Version:	2.4
-Release: 	11%{?dist}
+Version:	3.0.7
+Release: 	1%{?dist}
 Summary:	A graphical tool for managing LDAP servers
 
 Group:		Applications/System
 License:	GPLv2
 URL:		http://www.sourceforge.net/projects/luma
-Source0:	http://prdownloads.sourceforge.net/luma/luma-%{version}.tar.bz2
-Source1:	luma.desktop
-Patch1:		luma-2.3-plugins.patch
-Patch3:		luma-2.4-extspc.patch
+Source0:	http://prdownloads.sourceforge.net/luma/luma-%{version}.tar.gz
+Patch1:		luma-3.0.7-desktop.patch
 
-BuildArch:	noarch
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildArch:	noarch 
 
-BuildRequires:	python >= 2.3
-BuildRequires:	PyQt >= 3.10
+BuildRequires:	python-devel >= 2.6
+BuildRequires:	PyQt4
 BuildRequires:	python-ldap >= 2.3
 BuildRequires:	python-smbpasswd
 BuildRequires:	desktop-file-utils
 BuildRequires:  ImageMagick
 
-Requires:	python >= 2.3
-Requires:	PyQt >= 3.10
+Requires:	python >= 2.6
+Requires:	PyQt4
 Requires:	python-ldap >= 2.3
 Requires:	python-smbpasswd
-Requires:	desktop-file-utils
 
 %description
 Luma - a graphical tool for accessing and managing LDAP 
@@ -39,83 +31,37 @@ functionality for easy creation of plugins are delivered.
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch1 -p1 
-%patch3 -p1 
+%patch1 -p1 -b .dsk
 
 %build
-
+python ./setup.py build
 
 %install
-rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT%{_prefix}
-./install.py --prefix=$RPM_BUILD_ROOT%{_prefix}
-
-mkdir -p ${RPM_BUILD_ROOT}/%{_datadir}/icons
-
-pushd ${RPM_BUILD_ROOT}/%{_prefix}/lib
-mv luma ${RPM_BUILD_ROOT}/%{_datadir}/luma/lib
-popd
-
-pushd ${RPM_BUILD_ROOT}/%{_bindir}
-ln -sf ../share/luma/lib/luma.py luma
-popd
-
-pushd share/luma/icons
-convert luma-blau.eps -geometry 48 luma-48.png
-cp luma-48.png ${RPM_BUILD_ROOT}/%{lumadata}/icons/
-popd
- 
-# cp share/luma/icons/luma-64.png ${RPM_BUILD_ROOT}/%{_datadir}/icons/
+python ./setup.py install --root=$RPM_BUILD_ROOT
 
 # Desktop entry for luma-settings
-desktop-file-install --vendor fedora \
-	--dir $RPM_BUILD_ROOT%{_datadir}/applications/ \
-	--add-category System \
-	--add-category Application \
-	%{SOURCE1}
-
-for i in 22 32 48 ; do # 16, 64, 128 do not have transparent bg...
-  d=$RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${i}x${i}/apps
-  install -dm 755 $d
-  ln -s ../../../../luma/icons/luma-$i.png $d/luma.png
-done
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
+desktop-file-validate \
+	$RPM_BUILD_ROOT%{_datadir}/applications/luma.desktop  
 
 %files
 %defattr(-,root,root,-)
 %{_bindir}/luma
-%dir %{lumadata}
-
-%{lumalib}/ 
 
-%{lumadata}/doc/
-%{lumadata}/icons/
+%{_datadir}/icons/
+%{_datadir}/pixmaps/
 
-%dir %{lumadata}/i18n/
-%lang(br) %{lumadata}/i18n/*br.*
-%lang(cs) %{lumadata}/i18n/*cs.*
-%lang(de) %{lumadata}/i18n/*de.*
-%lang(en) %{lumadata}/i18n/gb.png
-%lang(es) %{lumadata}/i18n/*es.*
-%lang(fr) %{lumadata}/i18n/*fr.*
-# %lang(it) %{lumadata}/i18n/*it.*
-%lang(no) %{lumadata}/i18n/*no*
-%lang(ru) %{lumadata}/i18n/*ru.*
-%lang(sv) %{lumadata}/i18n/*sv.*
-
-%{_datadir}/applications/fedora-luma.desktop
-# %{_datadir}/icons/luma-*.png
-%{_datadir}/icons/hicolor/*/apps/*.png
+%{_datadir}/applications/luma.desktop
 
 %{_mandir}/man1/luma.1.gz
 
-%doc LICENSE
+%{python_sitelib}/
 
+%doc AUTHORS ChangeLog COPYING README TODO
 
 %changelog
+* Tue Oct  2 2012 Jochen Schmitt <JOchen herr-schmitt de> - 3.0.7-1
+- New upstream release
+
 * Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.4-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
diff --git a/sources b/sources
index 19dfaa4..df49fe8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b15b7c4dccae6ddcedc9195dd6160944  luma-2.4.tar.bz2
+b84a378d171cdf070b25aa7794b33214  luma-3.0.7.tar.gz