[python-dirq/el5: 11/11] Merge branch 'master' into el5

[mpaladin]

commit 88656dfc89c1b208fceb3839f0c53020e55bf861
Merge: da55a98 e8814f6
Author: mpaladin <massimo.paladin at gmail.com>
Date:   Mon Apr 2 11:23:41 2012 +0200

    Merge branch 'master' into el5
    
    Conflicts:
    	.gitignore
    	python-dirq.spec
    	sources

 .gitignore                |    4 +++-
 dirq-1.0.1-dist-tag.patch |    9 +++++++++
 python-dirq.spec          |   33 +++++++++++++++------------------
 sources                   |    2 +-
 4 files changed, 28 insertions(+), 20 deletions(-)
---
diff --cc .gitignore
index c7743bf,4febc2d..72688da
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,4 +1,3 @@@
--dirq-0.0.5.tar.gz
+ /dirq-1.0.1.tar.gz
+ /dirq-1.1.1.tar.gz
+ /dirq-1.1.2.tar.gz
diff --cc python-dirq.spec
index 1727b8a,8dbcfd4..bc06701
--- a/python-dirq.spec
+++ b/python-dirq.spec
@@@ -114,16 -115,16 +118,6 @@@ pushd %{altpydir
  popd
  %endif
  
--%if %{?fedora}%{!?fedora:0} < 5 && %{?rhel}%{!?rhel:0} < 6
--%{__python} -c 'import compileall; compileall.compile_dir("'"$RPM_BUILD_ROOT"'", 10, "%{python_sitearch}", 1)' > /dev/null
--%{__python} -O -c 'import compileall; compileall.compile_dir("'"$RPM_BUILD_ROOT"'", 10, "%{python_sitearch}", 1)' > /dev/null
--%if %{?altpython:1}%{!?altpython:0}
--%{__altpython} -c 'import compileall; compileall.compile_dir("'"$RPM_BUILD_ROOT%{altpython_sitearch}"'", 10, "%{altpython_sitearch}", 1)' > /dev/null
--%{__altpython} -O -c 'import compileall; compileall.compile_dir("'"$RPM_BUILD_ROOT%{altpython_sitearch}"'", 10, "%{altpython_sitearch}", 1)' > /dev/null
--%endif
--%endif 
--
--
  %check
  %{__python} setup.py test
  # And remove compiled documentation.
@@@ -152,10 -153,29 +146,13 @@@ rm -rf $RPM_BUILD_ROO
  %endif
  
  %changelog
+ * Fri Mar 30 2012 Massimo Paladin <massimo.paladin at gmail.com> - 1.1.2-1
+ - Update to 1.1.2.
+ 
 -* Tue Mar 20 2012 Massimo Paladin <massimo.paladin at gmail.com> - 1.1.1-1
 -- Update to 1.1.1.
 -
 -* Tue Feb 14 2012 Steve Traylen <steve.traylen at cern.ch> - 1.0.1-2
 -- Empty release for revision control error.
 -
 -* Tue Feb 14 2012 Steve Traylen <steve.traylen at cern.ch> - 1.0.1-1
 -- Update to 1.0.1.
 -- Enable python3 support with patch dirq-1.0.1-dist-tag.patch.
 -
 -* Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.0.5-6
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 -
 -* Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.0.5-5
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 -
 -* Sat Jul 31 2010 Thomas Spura <tomspur at fedoraproject.org> - 0.0.5-4
 -- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
 +* Sat Jul 24 2010 Steve Traylen <steve.traylen at cern.ch> - 0.0.5-3 1
 +- Fix requires abi for python26 sub package.
  
 -* Wed Jul 31 2010 Steve Traylen <steve.traylen at cern.ch> - 0.0.5-3
 +* Wed Jul 21 2010 Steve Traylen <steve.traylen at cern.ch> - 0.0.5-3
  - Really disable python3 support.
  - Change /usr/bin/env python to /usr/bin/python everywhere.