Accepting request 77690 from home:Heinervdm:branches:Education

* Remove an unused include, now fritzing can be compiled with Qt 4.6.
* Fritzing can now be build for Debian 6.0, Ubuntu 10.04, SLE-11-SP1, RHEL6, CentOS-6, Mandriva2010.1
* Added translations to the packages
* Fixed runtimedependencies (libqsqlite.so and libqjped.so)
* Put all LICENSE files in the packages

OBS-URL: https://build.opensuse.org/request/show/77690
OBS-URL: https://build.opensuse.org/package/show/Education/fritzing?expand=0&rev=5

debian.changelog

@@ -1,3 +1,14 @@
+fritzing (0.6.2b-6) stable; urgency=low
+
+  * Add translations
+
+ -- Thomas Zimmermann <bugs@vdm-design.de>  Mon, 01 Aug 2011 21:04:00 +0200
+fritzing (0.6.2b-5) stable; urgency=low
+
+  * Remove unused includes to compile with qt 4.6 too
+  * Add libqt4-gui and libqt4-sql-sqlite to Depends
+
+ -- Thomas Zimmermann <bugs@vdm-design.de>  Mon, 01 Aug 2011 15:56:00 +0200
 fritzing (0.6.2b-4) stable; urgency=low
 
   * Fix fritzing-fix-app-folder.patch to apply cleanly for all packages

debian.control

@@ -2,13 +2,13 @@ Source: fritzing
 Section: electronics
 Priority: optional
 Maintainer: Brendan Howell <brendan@howell-ersatz.com>
-Build-Depends: debhelper (>= 7.0.12), libqtcore4 (>= 4.7.0), libqtgui4, libstdc++6, libc6, qt4-qmake, libqt4-dev, zlib1g-dev
+Build-Depends: debhelper (>= 7.0.12), libqtcore4, libqtgui4, libstdc++6, libc6, qt4-qmake, libqt4-dev, zlib1g-dev
 Standards-Version: 3.8.3
 Homepage: http://fritzing.org
 
 Package: fritzing
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libqtcore4 (>=4.7.0), libqtgui4, libqt4-network, libqt4-sql, libqt4-svg, libqt4-xml
+Depends: ${shlibs:Depends}, ${misc:Depends}, libqtcore4, libqt4-gui, libqt4-network, libqt4-sql, libqt4-svg, libqt4-xml, libqt4-sql-sqlite
 Description: Easy-to-use, electronic design software.
  Fritzing is an open source project designed to help one transition from a
  prototype to a finished project. Aimed at users who want to produce or document

debian.docs

@@ -0,0 +1,4 @@
+LICENSE.CC-BY-SA
+LICENSE.GPL2
+LICENSE.GPL3
+README.txt

debian.install

@@ -5,3 +5,5 @@ parts /usr/share/fritzing
 resources/images/fritzing_icon.png /usr/share/icons
 fritzing.1 /usr/share/man/man1
 fritzing.desktop /usr/share/applications
+translations/*.qm /usr/share/fritzing/translations
+translations/syntax /usr/share/fritzing/translations

debian.series

@@ -1 +1,2 @@
 fritzing-fix-app-folder.patch -p1
+remove-unused-qt47-includes.patch -p1

fritzing.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Aug 01 19:04:00 UTC 2011 - bugs@vdm-design.de
+
+- add translations
+- add runtime dependencies for libqsqlite.so and libqjpeg.so
+- add packages for debian, mandriva, centos, sles and rhel
+
 -------------------------------------------------------------------
 Thu Jul 28 21:09:30 UTC 2011 - bugs@vdm-design.de
 

fritzing.desktop

@@ -7,3 +7,4 @@ Icon=fritzing
 Terminal=false
 Type=Application
 Categories=Development;IDE;Electronics;
+X-SuSE-translate=false

fritzing.dsc

@@ -4,7 +4,7 @@ Version: 0.6.2b
 Binary: fritzing
 Maintainer: Brendan Howell <brendan@howell-ersatz.com>
 Architecture: any
-Build-Depends: debhelper (>= 7.0.12), libqtcore4 (>= 4.7.0), libqtgui4, libstdc++6, libc6, qt4-qmake, libqt4-dev, zlib1g-dev
+Build-Depends: debhelper (>= 7.0.12), libqtcore4, libqtgui4, libstdc++6, libc6, qt4-qmake, libqt4-dev, zlib1g-dev, libqt4-sql-sqlite
 Files: 
  050878262fa170f0dfbd92ef9b3da973 10789952 fritzing_0.6.2b.orig.tar.gz
  050878262fa170f0dfbd92ef9b3da973 10789952 fritzing_0.6.2b.diff.gz

fritzing.spec

@@ -17,8 +17,13 @@ Source2:        fritzing.1
 # Fedora-specific patch to relocate shared data for system-wide install;
 # will require a more thorough approach from the Fritzing team eventually.
 Patch0:         fritzing-fix-app-folder.patch
+Patch1:         remove-unused-qt47-includes.patch
+Requires: libqt4-sql-sqlite libqt4-x11
 BuildRequires:  desktop-file-utils
 BuildRequires:  libqt4-devel
+%if 0%{?centos_version} || 0%{?rhel_version}
+BuildRequires: qt4-devel gcc-c++
+%endif
 %if 0%{?fedora}
 BuildRequires: qt gcc-c++ libstdc++-devel
 %endif
@@ -36,10 +41,11 @@ prototypes, and to create a PCB layout for manufacturing.
 %setup -q -n %{name}.%{snap}.source
 sed -i 's/\r//' README.txt
 %patch0 -p1
+%patch1 -p1
 
 %build
-%if 0%{?mandriva_version} 
+%if 0%{?mandriva_version} || 0%{?centos_version}
-export PATH=/usr/lib/qt4/bin:$PATH  
+export PATH=/usr/lib/qt4/bin:/usr/lib64/qt4/bin:$PATH
 export QTDIR=%{_prefix}/lib/qt4/
 %endif
 %if 0%{?fedora} || 0%{?rhel_version}
@@ -50,12 +56,19 @@ qmake
 make %{?_smp_mflags}
 
 %install
+%if 0%{?mandriva_version} || 0%{?sles_version}
+%{__make} install
+%else
 %make_install
+%endif
 install -D -m 0755 Fritzing %{buildroot}%{_bindir}/fritzing
 install -d %{buildroot}%{_datadir}/%{name}
 cp -pr sketches     %{buildroot}%{_datadir}/%{name}
 cp -pr parts        %{buildroot}%{_datadir}/%{name}
 cp -pr bins         %{buildroot}%{_datadir}/%{name}
+cp -pr translations %{buildroot}%{_datadir}/%{name}
+rm %{buildroot}%{_datadir}/%{name}/translations/*.ts
+find %{buildroot}%{_datadir}/%{name}/translations -name "*.qm" -size -128c -delete
 find %{buildroot}%{_datadir}/%{name} -type f -exec chmod 644 {} \;
 find %{buildroot}%{_datadir}/%{name} -type d -exec chmod 755 {} \;
 install -D -m 0644 resources/images/fritzing_icon.png %{buildroot}%{_datadir}/pixmaps/fritzing.png
@@ -67,7 +80,7 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc README.txt LICENSE.GPL2 LICENSE.GPL3
+%doc README.txt LICENSE.GPL2 LICENSE.GPL3 LICENSE.CC-BY-SA
 %{_bindir}/%{name}
 %{_datadir}/%{name}/
 %{_datadir}/applications/%{name}.desktop

remove-unused-qt47-includes.patch

@@ -0,0 +1,12 @@
+diff -Nurd fritzing.2011.07.11.source.orig//src/autoroute/cmrouter/cmrouter.cpp fritzing.2011.07.11.source/src/autoroute/cmrouter/cmrouter.cpp
+--- fritzing.2011.07.11.source.orig//src/autoroute/cmrouter/cmrouter.cpp	2011-07-11 17:50:17.000000000 +0200
++++ fritzing.2011.07.11.source/src/autoroute/cmrouter/cmrouter.cpp	2011-08-01 07:41:49.170492537 +0200
+@@ -107,7 +107,7 @@
+ #include <limits>
+ #include <QApplication>
+ #include <QMessageBox> 
+-#include <QElapsedTimer>
++//#include <QElapsedTimer>
+ #include <QSettings>
+ #include <QCryptographicHash>
+