rpms/eric/devel .cvsignore, 1.10, 1.11 eric.spec, 1.26, 1.27 sources, 1.11, 1.12

[Johan Cwiklinski (trasher)]

Author: trasher

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

Modified Files:
	.cvsignore eric.spec sources 
Log Message:
New upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/eric/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	5 Jul 2008 20:29:14 -0000	1.10
+++ .cvsignore	15 Aug 2008 16:59:51 -0000	1.11
@@ -1,5 +1,7 @@
-eric4-4.1.6.tar.gz
-eric4-i18n-cs-4.1.6.tar.gz
-eric4-i18n-de-4.1.6.tar.gz
-eric4-i18n-fr-4.1.6.tar.gz
-eric4-i18n-ru-4.1.6.tar.gz
+eric4-4.2.0.tar.gz
+eric4-i18n-cs-4.2.0.tar.gz
+eric4-i18n-de-4.2.0.tar.gz
+eric4-i18n-es-4.2.0.tar.gz
+eric4-i18n-fr-4.2.0.tar.gz
+eric4-i18n-ru-4.2.0.tar.gz
+eric4-i18n-tr-4.2.0.tar.gz


Index: eric.spec
===================================================================
RCS file: /cvs/extras/rpms/eric/devel/eric.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- eric.spec	5 Jul 2008 20:29:14 -0000	1.26
+++ eric.spec	15 Aug 2008 16:59:51 -0000	1.27
@@ -4,7 +4,7 @@
 
 Name:    eric
 Summary: Python IDE
-Version: 4.1.6
+Version: 4.2.0
 Release: 1%{?dist}
 
 License: GPL+
@@ -12,12 +12,13 @@
 URL:     http://www.die-offenbachs.de/eric/index.html
 Source:  http://downloads.sourceforge.net/sourceforge/eric-ide/%{name}4-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch: noarch
 
 Source1: http://downloads.sourceforge.net/sourceforge/eric-ide/%{name}4-i18n-fr-%{version}.tar.gz
 Source2: http://downloads.sourceforge.net/sourceforge/eric-ide/%{name}4-i18n-de-%{version}.tar.gz
 Source3: http://downloads.sourceforge.net/sourceforge/eric-ide/%{name}4-i18n-ru-%{version}.tar.gz
 Source4: http://downloads.sourceforge.net/sourceforge/eric-ide/%{name}4-i18n-cs-%{version}.tar.gz
+Source5: http://downloads.sourceforge.net/sourceforge/eric-ide/%{name}4-i18n-es-%{version}.tar.gz
+Source6: http://downloads.sourceforge.net/sourceforge/eric-ide/%{name}4-i18n-tr-%{version}.tar.gz
 Source10: eric4.desktop
 
 Patch1:    eric4-4.1.0-shebang.patch
@@ -35,6 +36,7 @@
 Requires: qt4-designer
 Requires: qt4-doc
 
+
 %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()")
@@ -47,25 +49,26 @@
 
 
 %prep
-%setup -q -a 1 -a 2 -a 3 -a 4 -n %{name}4-%{version}
+%setup -q -a 1 -a 2 -a 3 -a 4 -a 5 -a 6 -n %{name}4-%{version}
 
 %patch1 -p1
 
-sed -i -e 's|"QtToolsPostfix4" : ""|"QtToolsPostfix4" : "-qt4"|' eric/Preferences/__init__.py
-sed -i -e "s|@APIDIR@|%{_datadir}/eric|" eric/Preferences/__init__.py
-
 # copy language files
 mv eric4-%{version}/%{name}/i18n/*.qm %{name}/i18n/
-mv eric4-%{version}/%{name}/i18n/*.ts %{name}/i18n/
+
 rm -rf %{name}-%{version}
 
+
 %build
+# Empty build
 
 
 %install
 rm -rf %{buildroot}
 mkdir -p %{buildroot}/
 
+sed -i -e 's|qtDataDir = pyqtconfig._pkg_config\["qt_data_dir"\]|qtDataDir = "%{buildroot}" + pyqtconfig._pkg_config\["qt_data_dir"\]|' install.py
+
 %{__python} install.py \
   -i %{buildroot}/ \
   -b %{_bindir} \
@@ -130,8 +133,16 @@
 %{_datadir}/applications/*eric4.desktop
 %{_datadir}/icons/hicolor/*/*/*
 
+%{_libdir}/qt4/qsci/api/python/*.api
+%{_libdir}/qt4/qsci/api/ruby/*.api
+
 
 %changelog
+* Fri Aug 15 2008 Johan Cwiklinski <johan AT x-tnd DOT be> 4.2.0-1
+- 4.2.0
+- no longer noarch package (see bz #456761)
+- .ts files from translations should not be included
+
 * Sat Jul 05 2008 Johan Cwiklinski <johan AT x-tnd DOT be> 4.1.6-1
 - 4.1.6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/eric/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	5 Jul 2008 20:29:14 -0000	1.11
+++ sources	15 Aug 2008 16:59:51 -0000	1.12
@@ -1,5 +1,7 @@
-fa8d0a230d9f369c67acd72dc35cea83  eric4-4.1.6.tar.gz
-20fd04deb6ea73915f1e13d6a35356f5  eric4-i18n-cs-4.1.6.tar.gz
-72b8b7b45ebbdacaf3aa7b14c6e24a39  eric4-i18n-de-4.1.6.tar.gz
-aa62e7d3973ca75a781e9d53c3a99717  eric4-i18n-fr-4.1.6.tar.gz
-eb9f80000a4be3f05d3e1829b3fc6f46  eric4-i18n-ru-4.1.6.tar.gz
+893ba74b5e53ac0677a132078a4bcb46  eric4-4.2.0.tar.gz
+b6ece32cbe82b1485518482203cf3a60  eric4-i18n-cs-4.2.0.tar.gz
+41d5ea6de4e5e323ed1c53d9366d7d3a  eric4-i18n-de-4.2.0.tar.gz
+6df33bada6eb930919e31f75ee8a3be8  eric4-i18n-es-4.2.0.tar.gz
+a37cacc03884d3afdee4ba8c55caefd4  eric4-i18n-fr-4.2.0.tar.gz
+161cf85b58b40fbc88f1a19a70149f55  eric4-i18n-ru-4.2.0.tar.gz
+c4f5e1be85e689b4d8ce18cb37eb2e09  eric4-i18n-tr-4.2.0.tar.gz