From 74cef213943ed9b40e7577966e2249b00358b48cd12c70a7c307584e19e5ba45 Mon Sep 17 00:00:00 2001
From: Jan Matejek <ja+suse@matejcik.cz>
Date: Thu, 7 May 2015 11:54:26 +0000
Subject: [PATCH] Accepting request 305462 from
 home:benoit_monin:branches:devel:languages:python

- update to version 1.3.0
- add fdupes as BuildRequires and call it after install
- fix end of line of README.rst
- remove chmod of msgfmt.py: file deleted upstream
- install html documentation in the docdir of the main package
- do not install PKG-INFO in the documentation: already provided by the egg-info

OBS-URL: https://build.opensuse.org/request/show/305462
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-FormEncode?expand=0&rev=11
---
 FormEncode-1.2.6.zip      |  3 ---
 FormEncode-1.3.0.zip      |  3 +++
 python-FormEncode.changes | 21 +++++++++++++++++++++
 python-FormEncode.spec    | 22 ++++++++++++++++------
 4 files changed, 40 insertions(+), 9 deletions(-)
 delete mode 100644 FormEncode-1.2.6.zip
 create mode 100644 FormEncode-1.3.0.zip

diff --git a/FormEncode-1.2.6.zip b/FormEncode-1.2.6.zip
deleted file mode 100644
index 3ffc8bf..0000000
--- a/FormEncode-1.2.6.zip
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:70fc1d2cf8022b1cc7fcebb5d87cc984dde799e587f05c0a0fe509b374221b0c
-size 318441
diff --git a/FormEncode-1.3.0.zip b/FormEncode-1.3.0.zip
new file mode 100644
index 0000000..513ef2f
--- /dev/null
+++ b/FormEncode-1.3.0.zip
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e6757280244a0d04e9cef51beeeafb4124087c27b7944c7d41341d0a30f7af78
+size 347674
diff --git a/python-FormEncode.changes b/python-FormEncode.changes
index c08505b..69542fb 100644
--- a/python-FormEncode.changes
+++ b/python-FormEncode.changes
@@ -1,3 +1,24 @@
+-------------------------------------------------------------------
+Tue May  5 14:33:11 UTC 2015 - benoit.monin@gmx.fr
+
+- update to version 1.3.0:
+  * Support validation of email addresses with unicode domain names
+  * FormEncode 1.3 is no longer compatible with Python 2.3, 2.4, or
+    2.5
+  * FormEncode now also runs under Python 3.2 and 3.3
+  * Validation of email addresses using resolve_domain option now
+    requires the dnspython third party library instead of pyDNS
+  * The FancyValidator methods _to_python, _from_python,
+    validate_python and validate_other have been renamed to
+    _convert_to_python, _convert_from_python, _validate_python and
+    _validate_other, respectively
+- add fdupes as BuildRequires and call it after install
+- fix end of line of README.rst
+- remove chmod of msgfmt.py: file deleted upstream
+- install html documentation in the docdir of the main package
+- do not install PKG-INFO in the documentation: already provided
+  by the egg-info
+
 -------------------------------------------------------------------
 Thu Oct 24 11:05:56 UTC 2013 - speilicke@suse.com
 
diff --git a/python-FormEncode.spec b/python-FormEncode.spec
index 340e650..5d972d2 100644
--- a/python-FormEncode.spec
+++ b/python-FormEncode.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package python-FormEncode
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
 
 
 Name:           python-FormEncode
-Version:        1.2.6
+Version:        1.3.0
 Release:        0
 Url:            http://formencode.org
 Summary:        HTML form validation, generation, and conversion package
@@ -26,6 +26,7 @@ Group:          Development/Languages/Python
 Source:         http://pypi.python.org/packages/source/F/FormEncode/FormEncode-%{version}.zip
 Source1:        FormEncode-doc-infrastructure.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+BuildRequires:  fdupes
 BuildRequires:  python-devel
 BuildRequires:  python-setuptools
 BuildRequires:  unzip
@@ -56,7 +57,7 @@ This package contains documentation files for %{name}.
 %prep
 %setup -q -n FormEncode-%{version} -a1
 find . -name \*.txt -exec sed -i 's/\r$//g' {} \;
-sed -i 's/\r$//g' PKG-INFO formencode/i18n/msgfmt.py
+sed -i 's/\r$//g' PKG-INFO README.rst
 
 %build
 python setup.py build
@@ -64,15 +65,24 @@ python setup.py build_sphinx && rm build/sphinx/html/.buildinfo
 
 %install
 python setup.py install --prefix=%{_prefix} --root=%{buildroot}
-chmod 755 %{buildroot}%{python_sitelib}/formencode/i18n/msgfmt.py
+
+# install documentation
+rm -r %{buildroot}/%{python_sitelib}/docs # remove misplaced documentation
+mkdir -p %{buildroot}%{_docdir}/%{name}
+cp -r README.rst build/sphinx/html %{buildroot}%{_docdir}/%{name}/
+
+%fdupes %{buildroot}/%{_prefix}
 
 %files
 %defattr(-,root,root,-)
-%doc PKG-INFO README.txt
+%exclude %{_docdir}/%{name}/html
+%doc %dir %{_docdir}/%{name}/
+%doc %{_docdir}/%{name}/README.rst
 %{python_sitelib}/*
 
 %files doc
 %defattr(-,root,root,-)
-%doc build/sphinx/html/
+%doc %dir %{_docdir}/%{name}/html
+%doc %{_docdir}/%{name}/html/*
 
 %changelog