[umit/f19] Update to 1.0

[lystor]

commit 88d4234731e9a1dfde39772b5eb3f456a3b4e196
Author: lystor <lystor at bee.pkgs.org>
Date:   Wed Mar 27 14:11:51 2013 +0200

    Update to 1.0

 .gitignore                |    1 +
 sources                   |    2 +-
 umit-1.0-setup.py.patch   |   13 +++++++++++++
 umit-1.0-usrmove.patch    |   13 +++++++++++++
 umit-1.0RC-setup.py.patch |   12 ------------
 umit.spec                 |   22 ++++++++++------------
 6 files changed, 38 insertions(+), 25 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d28ba3f..38c0fa7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 umit-1.0RC.tar.gz
+/umit-1.0.tar.gz
diff --git a/sources b/sources
index a473013..0b01467 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e096ac3795017ba87be4ed569c520be8  umit-1.0RC.tar.gz
+610bbefd6123d44af57e9b1206872b12  umit-1.0.tar.gz
diff --git a/umit-1.0-setup.py.patch b/umit-1.0-setup.py.patch
new file mode 100644
index 0000000..b4698a2
--- /dev/null
+++ b/umit-1.0-setup.py.patch
@@ -0,0 +1,13 @@
+diff -up umit-1.0/setup.py.orig umit-1.0/setup.py
+--- umit-1.0/setup.py.orig	2011-03-27 16:49:58.000000000 +0300
++++ umit-1.0/setup.py	2013-03-27 13:47:36.860492699 +0200
+@@ -266,9 +266,6 @@ class umit_install(install):
+         install.run(self)
+ 
+         self.set_perms()
+-        self.set_modules_path()
+-        self.fix_paths()
+-        self.create_uninstaller()
+         self.finish_banner()
+ 
+     def create_uninstaller(self):
diff --git a/umit-1.0-usrmove.patch b/umit-1.0-usrmove.patch
new file mode 100644
index 0000000..2ab58a6
--- /dev/null
+++ b/umit-1.0-usrmove.patch
@@ -0,0 +1,13 @@
+diff -up umit-1.0/umit/core/BasePaths.py.orig umit-1.0/umit/core/BasePaths.py
+--- umit-1.0/umit/core/BasePaths.py.orig	2011-03-27 16:50:00.000000000 +0300
++++ umit-1.0/umit/core/BasePaths.py	2013-03-27 13:50:26.667860888 +0200
+@@ -54,6 +54,9 @@ else:
+         # checkout.
+         main_dir = os.path.abspath(os.path.join(main_dir, os.path.pardir))
+ 
++# Fedora Features/UsrMove workaround
++main_dir = '/usr'
++
+ CONFIG_DIR = os.path.join(main_dir, "share", "umit", "config")
+ LOCALE_DIR = os.path.join(main_dir, "share", "locale")
+ MISC_DIR = os.path.join(main_dir, "share", "umit", "misc")
diff --git a/umit.spec b/umit.spec
index 96dfddb..6f19f9b 100644
--- a/umit.spec
+++ b/umit.spec
@@ -1,24 +1,21 @@
-%if ! (0%{?fedora} > 12 || 0%{?rhel} > 5)
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-%endif
-
-%global prerelease RC
 
 Name:           umit
 Version:        1.0
-Release:        0.8.%{prerelease}%{?dist}
+Release:        1%{?dist}
 Summary:        Nmap front-end
 
 Group:          Applications/Internet
 License:        GPLv2+ and LGPLv2+
 URL:            http://umit.sourceforge.net/
-Source0:        http://downloads.sourceforge.net/umit/umit-%{version}%{prerelease}.tar.gz
+Source0:        http://downloads.sourceforge.net/umit/umit-%{version}.tar.gz
 # http://trac.umitproject.org/ticket/378
 Source1:        umit_48x48.png
 # http://trac.umitproject.org/ticket/378
 Source2:        umit.desktop
 # Fedora-specific: Fix check-buildroot issues
-Patch0:         umit-1.0RC-setup.py.patch
+Patch0:         umit-1.0-setup.py.patch
+Patch1:         umit-1.0-usrmove.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -49,8 +46,9 @@ Graphical Interface. Some of its main features include:
 
 
 %prep
-%setup -q -n umit-%{version}%{prerelease}
+%setup -q
 %patch0 -p1
+%patch1 -p1
 
 
 %build
@@ -59,10 +57,7 @@ Graphical Interface. Some of its main features include:
 
 %install
 rm -rf %{buildroot}
-%{__python} setup.py install --root %{buildroot}
-
-# Remove useless files
-rm %{buildroot}%{_bindir}/uninstall_umit
+%{__python} setup.py install -O1 --skip-build --root %{buildroot}
 
 # Fix permissions
 find %{buildroot} -type f -exec chmod 644 {} \;
@@ -125,6 +120,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Wed Mar 27 2013 Nikolay Ulyanitsky <lystor AT gmail.com> - 1.0-1
+- Update to 1.0
+
 * Fri Feb 15 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-0.8.RC
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild