rpms/eric/devel eric.spec,1.10,1.11

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/pkgs/rpms/eric/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv446

Modified Files:
	eric.spec 
Log Message:
* Mon Aug 27 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.9.2-3
- License: GPL+
- don't set PYTHONOPTIMIZE, let brp-python-bytecompile do it's job,
  addresses selinux issues (#243163, #254421)



Index: eric.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eric/devel/eric.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- eric.spec	9 Dec 2006 17:29:35 -0000	1.10
+++ eric.spec	27 Aug 2007 13:30:50 -0000	1.11
@@ -5,9 +5,9 @@
 Name:	 eric
 Summary: Python IDE
 Version: 3.9.2
-Release: 2%{?dist}.1
+Release: 3%{?dist}
 
-License: GPL
+License: GPL+
 Group:	 Development/Tools
 URL: 	 http://www.die-offenbachs.de/detlev/eric3.html
 Source:	 http://dl.sourceforge.net/sourceforge/eric-ide/eric-%{version}.tar.gz
@@ -35,7 +35,8 @@
 
 %global python_ver %(%{__python} -c "import sys ; print sys.version[:3]")
 %global python_sitedir %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
-%if "%{?python_ver}" > "2"
+## python >=2.4 automatically uses python(abi)
+%if "%{?python_ver}" > "1" && "%{?python_ver}" < "2.4"
 Requires: python-abi = %{python_ver}
 %endif
 
@@ -61,7 +62,7 @@
 
 # Either set PYTHONOPTIMIZE here or 
 # call /usr/lib/rpm/brp-python-bytecompile later (but before generating .pyo file list) 
-PYTHONOPTIMIZE=1; export PYTHONOPTIMIZE
+# PYTHONOPTIMIZE=1; export PYTHONOPTIMIZE
 
 %{__python} install.py \
   -i %{buildroot}/ \
@@ -70,7 +71,7 @@
 
 desktop-file-install \
   --dir %{buildroot}/%{_datadir}/applications/ \
-  --add-category="X-Fedora" --vendor="" \
+  --vendor="" \
   %{SOURCE10}
 
 install -m644 -p -D \
@@ -140,6 +141,11 @@
 
 
 %changelog
+* Mon Aug 27 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.9.2-3
+- License: GPL+
+- don't set PYTHONOPTIMIZE, let brp-python-bytecompile do it's job,
+  addresses selinux issues (#243163, #254421)
+
 * Wed Nov 22 2006 Rex Dieter <rexdieter[AT]users.sf.net> 3.9.2-2
 - Provides: eric3 (get ready for PyQt4-based eric4)
 - fix biffed %%version's in %%changelog