rpms/eric/F-9 eric.spec,1.28,1.29 sources,1.13,1.14

[Johan Cwiklinski]

Author: trasher

Update of /cvs/extras/rpms/eric/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30402

Modified Files:
	eric.spec sources 
Log Message:
Update to 4.2.1



Index: eric.spec
===================================================================
RCS file: /cvs/extras/rpms/eric/F-9/eric.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- eric.spec	5 Jul 2008 20:39:07 -0000	1.28
+++ eric.spec	21 Sep 2008 10:17:02 -0000	1.29
@@ -2,9 +2,12 @@
 # Fedora review
 # http://bugzilla.redhat.com/186919
 
+# avoid empty debuginfo package
+%define debug_package %{nil}
+
 Name:    eric
 Summary: Python IDE
-Version: 4.1.6
+Version: 4.2.1
 Release: 1%{?dist}
 
 License: GPL+
@@ -12,12 +15,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
@@ -47,30 +51,34 @@
 
 
 %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}/
 
+#path to install api files
+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} \
   -d %{python_sitedir}
 
+#we have to correct api path to remove %{builddir}
+sed -i -e 's|%{buildroot}||' %{buildroot}%{python_sitedir}/eric4config.py
+
 desktop-file-install \
   --dir %{buildroot}/%{_datadir}/applications/ \
   --vendor="" \
@@ -130,8 +138,16 @@
 %{_datadir}/applications/*eric4.desktop
 %{_datadir}/icons/hicolor/*/*/*
 
+%{_libdir}/qt4/qsci/api/python/*.api
+%{_libdir}/qt4/qsci/api/ruby/*.api
+
 
 %changelog
+* Sun Sep 7 2008 Johan Cwiklinski <johan AT x-tnd DOT be> 4.2.1-1
+- 4.2.1
+- 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/F-9/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	5 Jul 2008 20:39:07 -0000	1.13
+++ sources	21 Sep 2008 10:17:02 -0000	1.14
@@ -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
+b2a9edb6c44319f3f96afba32be337bb  eric4-4.2.1.tar.gz
+637ce2a08d360ae82d283a0c76000b85  eric4-i18n-cs-4.2.1.tar.gz
+d336411c95534a01718abd932c3289fa  eric4-i18n-de-4.2.1.tar.gz
+df5bbbfedf7b10ed7359884845e98235  eric4-i18n-es-4.2.1.tar.gz
+d8b6d0b94816ca5b5752ef6cdc682254  eric4-i18n-fr-4.2.1.tar.gz
+5f87a9a4920086b8ef1dc7152f4ac582  eric4-i18n-ru-4.2.1.tar.gz
+a4c55068b7c44d20906aabd223680453  eric4-i18n-tr-4.2.1.tar.gz