Accepting request 79363 from home:Heinervdm:branches:Education

Update to upstream version 0.6.3b
The patches are no langer needed as similar patches went upstream

OBS-URL: https://build.opensuse.org/request/show/79363
OBS-URL: https://build.opensuse.org/package/show/Education/fritzing?expand=0&rev=6
This commit is contained in:
Thomas Zimmermann 2011-08-19 18:31:53 +00:00 committed by Git OBS Bridge
parent 17b359fbd7
commit d2c33cd5b1
9 changed files with 19 additions and 50 deletions

View File

@ -1,3 +1,8 @@
fritzing (0.6.3b-0) stable; urgency=low
* new upstream release 0.6.3b
-- Thomas Zimmermann <bugs@vdm-design.de> Fri, 19 Aug 2011 16:07:00 +0200
fritzing (0.6.2b-6) stable; urgency=low
* Add translations

View File

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

View File

@ -1,21 +0,0 @@
diff -Nurd fritzing.2011.07.11.source.orig//src/utils/folderutils.cpp fritzing.2011.07.11.source/src/utils/folderutils.cpp
--- fritzing.2011.07.11.source.orig//src/utils/folderutils.cpp 2011-07-11 17:50:17.000000000 +0200
+++ fritzing.2011.07.11.source/src/utils/folderutils.cpp 2011-07-29 11:06:55.000000000 +0200
@@ -154,11 +154,14 @@
}
const QString FolderUtils::applicationDirPath() {
- if (m_appPath.isEmpty()) {
- return QCoreApplication::applicationDirPath();
+ if (!m_appPath.isEmpty()) {
+ return m_appPath;
}
- return m_appPath;
+ QDir dir("/usr/share/fritzing");
+ if (dir.exists()) return dir.path();
+
+ return QCoreApplication::applicationDirPath();
}
bool FolderUtils::setApplicationPath2(const QString & path)

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:09437ac6a464338066e8ea1068e53ca1881c10255faed0d0d18b7e020d95e804
size 8572608

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b02e81f510292eb07444f0e7cbae1a01018aedb2a4820381a0f30c7780226c17
size 8326886

View File

@ -1,4 +1,8 @@
-------------------------------------------------------------------
Fri Aug 19 18:05:00 UTC 2011 - bugs@vdm-design.de
- update to new upstream version 0.6.3b
-------------------------------------------------------------------
Mon Aug 01 19:04:00 UTC 2011 - bugs@vdm-design.de
- add translations

View File

@ -1,10 +1,10 @@
Format: 1.0
Source: fritzing
Version: 0.6.2b
Version: 0.6.3b
Binary: fritzing
Maintainer: Brendan Howell <brendan@howell-ersatz.com>
Architecture: any
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
050878262fa170f0dfbd92ef9b3da973 10789952 fritzing_0.6.3b.orig.tar.gz
050878262fa170f0dfbd92ef9b3da973 10789952 fritzing_0.6.3b.diff.gz

View File

@ -2,22 +2,19 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
%define snap 2011.07.11
%define vers 0.6.3
%define snap 2011.08.18
Name: fritzing
Version: 0.6.2b
Version: 0.6.3b
Release: 0
License: GPLv3+
Summary: Intuitive EDA platform featuring from prototype to product
Url: http://fritzing.org/
Group: Applications/Engineering
Source0: http://fritzing.org/download/%{version}/source-tarball/%{name}.%{snap}.source.tar.bz2
Source0: http://fritzing.org/download/%{version}/source-tarball/%{name}.%{vers}.source.tar.bz2
Source1: fritzing.desktop
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
@ -40,8 +37,6 @@ prototypes, and to create a PCB layout for manufacturing.
%prep
%setup -q -n %{name}.%{snap}.source
sed -i 's/\r//' README.txt
%patch0 -p1
%patch1 -p1
%build
%if 0%{?mandriva_version} || 0%{?centos_version}

View File

@ -1,12 +0,0 @@
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>