rpms/eric/devel eric4.desktop, NONE, 1.1 .cvsignore, 1.5, 1.6 eric.spec, 1.13, 1.14 sources, 1.5, 1.6 eric-3.9.0-prefs.patch, 1.1, NONE eric3.desktop, 1.1, NONE

Dennis Gilmore (ausil) fedora-extras-commits at redhat.com
Mon Jan 28 21:48:21 UTC 2008 

Author: ausil

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

Modified Files:
	.cvsignore eric.spec sources 
Added Files:
	eric4.desktop 
Removed Files:
	eric-3.9.0-prefs.patch eric3.desktop 
Log Message:
update to eric4



--- NEW FILE eric4.desktop ---
[Desktop Entry]
Name=Eric
Comment=Python IDE
Exec=eric4
Icon=eric4
Terminal=false
Type=Application
Encoding=UTF-8
Categories=Application;Development;


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/eric/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	15 Jan 2008 17:37:01 -0000	1.5
+++ .cvsignore	28 Jan 2008 21:47:46 -0000	1.6
@@ -1,4 +1,5 @@
-eric-3.9.5.tar.gz
-eric-i18n-de-3.9.5.tar.gz
-eric-i18n-fr-3.9.5.tar.gz
-eric-i18n-ru-3.9.5.tar.gz
+eric4-4.0.4.tar.gz
+eric4-i18n-cs_CZ-4.0.4.tar.gz
+eric4-i18n-de-4.0.4.tar.gz
+eric4-i18n-fr-4.0.4.tar.gz
+eric4-i18n-ru-4.0.4.tar.gz


Index: eric.spec
===================================================================
RCS file: /cvs/extras/rpms/eric/devel/eric.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- eric.spec	25 Jan 2008 11:42:43 -0000	1.13
+++ eric.spec	28 Jan 2008 21:47:46 -0000	1.14
@@ -6,31 +6,33 @@
 
 Name:    eric
 Summary: Python IDE
-Version: 3.9.5
-Release: 2%{?dist}
+Version: 4.0.4
+Release: 1%{?dist}
 
 License: GPL+
 Group:   Development/Tools
 URL:     http://www.die-offenbachs.de/eric/index.html
-Source:  http://dl.sourceforge.net/sourceforge/eric-ide/%{name}-%{version}.tar.gz
+Source:  http://dl.sourceforge.net/sourceforge/eric-ide/%{name}4-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 
-Source1: http://dl.sourceforge.net/sourceforge/eric-ide/%{name}-i18n-fr-%{version}.tar.gz
-Source2: http://dl.sourceforge.net/sourceforge/eric-ide/%{name}-i18n-de-%{version}.tar.gz
-Source3: http://dl.sourceforge.net/sourceforge/eric-ide/%{name}-i18n-ru-%{version}.tar.gz
-Source10: eric3.desktop
+Source1: http://dl.sourceforge.net/sourceforge/eric-ide/%{name}4-i18n-fr-%{version}.tar.gz
+Source2: http://dl.sourceforge.net/sourceforge/eric-ide/%{name}4-i18n-de-%{version}.tar.gz
+Source3: http://dl.sourceforge.net/sourceforge/eric-ide/%{name}4-i18n-ru-%{version}.tar.gz
+Source4: http://dl.sourceforge.net/sourceforge/eric-ide/%{name}4-i18n-cs_CZ-%{version}.tar.gz
+Source10: eric4.desktop
 
-Patch1: eric-3.9.0-prefs.patch
-Patch2: eric-3.9.5-shebang.patch
+Patch1: eric-3.9.5-shebang.patch
 
-Provides: eric3 = %{version}-%{release}
+Provides: eric4 = %{version}-%{release}
 
 BuildRequires: desktop-file-utils
-BuildRequires: PyQt-qscintilla-devel
+BuildRequires: qscintilla2-python
+# PyQt api's
+BuildRequires: PyQt4-devel
 
 # This can be left unversioned
-Requires: PyQt-qscintilla
+Requires: qscintilla2-python
 
 # Need this for the documentation
 Requires: python-docs
@@ -41,30 +43,18 @@
 %global python_ver %(%{__python} -c "import sys ; print sys.version[:3]")
 %global full_python_ver %(%{__python} -c "import sys ; print sys.version[:5]")
 %global python_sitedir %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
-## python >=2.4 automatically uses python(abi)
-%if "%{?python_ver}" > "1" && "%{?python_ver}" < "2.4"
-Requires: python-abi = %{python_ver}
-%endif
 
 %description
-eric3 is a full featured Python IDE.
+eric4 is a full featured Python IDE.
 
 
 %prep
-%setup -q -a 1 -a 2 -a 3 
+%setup -q -a 1 -a 2 -a 3 -a 4 -n %{name}4-%{version}
 
-%patch1 -p1 -b .prefs
-%patch2 -p1
+%patch1 -p1
 sed -i -e "s|@APIDIR@|%{_datadir}/eric|" eric/Preferences/__init__.py
 
 
-# copy language files
-mv %{name}-%{version}/%{name}/i18n/*.qm %{name}/i18n/
-mv %{name}-%{version}/%{name}/i18n/*.ts %{name}/i18n/
-rm -rf %{name}-%{version}
-
-
-
 %build
 
 
@@ -83,8 +73,8 @@
   %{SOURCE10}
 
 install -m644 -p -D \
-  %{buildroot}%{python_sitedir}/eric3/icons/default/eric.png \
-  %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/eric3.png
+  %{buildroot}%{python_sitedir}/eric4/icons/default/eric.png \
+  %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/eric4.png
 
 
 ## generate api files
@@ -100,16 +90,14 @@
 
 
 # mostly to make rpmlint happier, non-executable-scripts
-chmod a+x %{buildroot}%{python_sitedir}/eric3/ThirdParty/brm/bike/parsing/fastparser.py ||:
-chmod a+x %{buildroot}%{python_sitedir}/eric3/*.py ||:
-chmod a+x %{buildroot}%{python_sitedir}/eric3/ThirdParty/brm/bike/logging.py
-chmod a+x %{buildroot}%{python_sitedir}/eric3/uninstall.py
-chmod a+x %{buildroot}%{python_sitedir}/eric3/Examples/hallo.py
-chmod a+x %{buildroot}%{python_sitedir}/eric3/DebugClients/Python/PyCoverage.py
-chmod a+x %{buildroot}%{python_sitedir}/eric3/Examples/rhallo.py
-
-# add envrionment variables for qt, qt4 and python documentations
-sed -i -e 's|exec|QT4DIR=%{_libdir}/qt4\nPYTHONDOCDIR=%{_docdir}/python-docs-%{?full_python_ver}/html\nQTDOCDIR=%{_docdir}/qt-devel-%{?qt_ver}/html\nQT4DOCDIR=%{_docdir}/qt4/html\nexport QT4DIR PYTHONDOCDIR QTDOCDIR QT4DOCDIR\n&|' %{buildroot}%{_bindir}/eric3
+chmod a+x %{buildroot}%{python_sitedir}/eric4/ThirdParty/brm/bike/parsing/fastparser.py ||:
+chmod a+x %{buildroot}%{python_sitedir}/eric4/*.py ||:
+chmod a+x %{buildroot}%{python_sitedir}/eric4/ThirdParty/brm/bike/logging.py
+chmod a+x %{buildroot}%{python_sitedir}/eric4/uninstall.py
+chmod a+x %{buildroot}%{python_sitedir}/eric4/Examples/hallo.py
+chmod a+x %{buildroot}%{python_sitedir}/eric4/DebugClients/Python/PyCoverage.py
+chmod a+x %{buildroot}%{python_sitedir}/eric4/Examples/rhallo.py
+chmod a-x %{buildroot}%{python_sitedir}/eric4/patch_pyxml.py
 
 
 %post
@@ -128,17 +116,20 @@
 %files -f %{name}-files.list
 %defattr(-,root,root,-)
 %doc eric/README* THANKS LICENSE.GPL
-%{_bindir}/eric3*
-%{python_sitedir}/eric3config.py*
+%{_bindir}/eric4*
+%{python_sitedir}/eric4config.py*
 %{python_sitedir}/sitecustomize.py*
-%{python_sitedir}/eric3/
+%{python_sitedir}/eric4/
 
 %dir %{_datadir}/eric/
-%{_datadir}/applications/*eric3.desktop
+%{_datadir}/applications/*eric4.desktop
 %{_datadir}/icons/hicolor/*/*/*
 
 
 %changelog
+* Wed Jan 16 2008 Dennis Gilmore <dennis at ausil.us> 4.0.4-1
+- update to eric4
+
 * Thu Jan 17 2008 Johan Cwiklinski <johan AT x-tnd DOT be> 3.9.5-2
 - Add environment variable to set python, qt4 and qt docs path (bug #200856)
 - Requires python-doc, qt-designer, qt4-devel and qt4-doc


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/eric/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	15 Jan 2008 17:37:01 -0000	1.5
+++ sources	28 Jan 2008 21:47:46 -0000	1.6
@@ -1,4 +1,5 @@
-63d6fb3c302b603577554af62520c948  eric-3.9.5.tar.gz
-46138106a951e2af5c6dbc57cd558186  eric-i18n-de-3.9.5.tar.gz
-7f13aca3d31cc2f18b8d357172662834  eric-i18n-fr-3.9.5.tar.gz
-7b2927ae5a78622939d1e10f226b31cd  eric-i18n-ru-3.9.5.tar.gz
+1886926945a95c92f2151d5135120c67  eric4-4.0.4.tar.gz
+e502d9bc965fb036f3b8457319186c42  eric4-i18n-cs_CZ-4.0.4.tar.gz
+9ac505738bd5516de1a783a337899f71  eric4-i18n-de-4.0.4.tar.gz
+54255e7d984d360079822acd7e9f7172  eric4-i18n-fr-4.0.4.tar.gz
+4b57dd3dfcb3b4567a4d3e6ea7d880e6  eric4-i18n-ru-4.0.4.tar.gz


--- eric-3.9.0-prefs.patch DELETED ---


--- eric3.desktop DELETED ---

More information about the fedora-extras-commits mailing list