[fritzing] Updated to new upstream release, added google-droid-sans requirement.
Ed Marshall
logic at fedoraproject.org
Sun Feb 5 02:55:50 UTC 2012
commit f32eaa6a8906aaca5b07798ee38b7971786e6052
Author: Ed Marshall <esm at logic.net>
Date: Sat Feb 4 18:55:39 2012 -0800
Updated to new upstream release, added google-droid-sans requirement.
.gitignore | 1 +
fritzing-disable-autoupdate.patch | 112 +++++++----
fritzing-use-external-libs.patch | 376 +++++++++++++++++++++++++++++++++----
fritzing.spec | 16 +-
sources | 2 +-
5 files changed, 423 insertions(+), 84 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0d0d223..eb4afe7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/fritzing-0.6.4b.source.tar.bz2
/fritzing-0.6.5b.source.tar.bz2
+/fritzing-0.7.0b.source.tar.bz2
diff --git a/fritzing-disable-autoupdate.patch b/fritzing-disable-autoupdate.patch
index dae3746..79d92db 100644
--- a/fritzing-disable-autoupdate.patch
+++ b/fritzing-disable-autoupdate.patch
@@ -1,7 +1,7 @@
-diff -ur fritzing-0.6.4b.source.orig/src/fapplication.cpp fritzing-0.6.4b.source/src/fapplication.cpp
---- fritzing-0.6.4b.source.orig/src/fapplication.cpp 2011-12-16 11:07:52.000000000 -0800
-+++ fritzing-0.6.4b.source/src/fapplication.cpp 2011-12-16 15:48:10.724843929 -0800
-@@ -727,10 +727,6 @@
+diff -urP fritzing-0.7.0b.source.orig/src/fapplication.cpp fritzing-0.7.0b.source/src/fapplication.cpp
+--- fritzing-0.7.0b.source.orig/src/fapplication.cpp 2012-02-03 12:19:35.000000000 -0800
++++ fritzing-0.7.0b.source/src/fapplication.cpp 2012-02-03 17:40:15.540068716 -0800
+@@ -750,10 +750,6 @@
if (m_progressIndex >= 0) splash.showProgress(m_progressIndex, 0.825);
ProcessEventBlocker::processEvents();
@@ -12,7 +12,7 @@ diff -ur fritzing-0.6.4b.source.orig/src/fapplication.cpp fritzing-0.6.4b.source
if (m_progressIndex >= 0) splash.showProgress(m_progressIndex, 0.875);
loadSomething(firstRun, prevVersion);
-@@ -928,57 +924,6 @@
+@@ -951,57 +947,6 @@
ViewLayer::ViewLayerID viewLayerID;
};
@@ -70,10 +70,10 @@ diff -ur fritzing-0.6.4b.source.orig/src/fapplication.cpp fritzing-0.6.4b.source
void FApplication::createUserDataStoreFolderStructure() {
// make sure that the folder structure for parts and bins, exists
QString userDataStorePath = FolderUtils::getUserDataStorePath();
-diff -ur fritzing-0.6.4b.source.orig/src/fapplication.h fritzing-0.6.4b.source/src/fapplication.h
---- fritzing-0.6.4b.source.orig/src/fapplication.h 2011-12-16 11:07:53.000000000 -0800
-+++ fritzing-0.6.4b.source/src/fapplication.h 2011-12-16 15:47:32.565929301 -0800
-@@ -65,9 +65,6 @@
+diff -urP fritzing-0.7.0b.source.orig/src/fapplication.h fritzing-0.7.0b.source/src/fapplication.h
+--- fritzing-0.7.0b.source.orig/src/fapplication.h 2012-02-03 12:19:35.000000000 -0800
++++ fritzing-0.7.0b.source/src/fapplication.h 2012-02-03 17:40:15.540068716 -0800
+@@ -64,9 +64,6 @@
public slots:
void preferences();
@@ -83,35 +83,54 @@ diff -ur fritzing-0.6.4b.source.orig/src/fapplication.h fritzing-0.6.4b.source/s
void createUserDataStoreFolderStructure();
void changeActivation(bool activate, QWidget * originator);
void updateActivation();
-diff -ur fritzing-0.6.4b.source.orig/src/mainwindow.cpp fritzing-0.6.4b.source/src/mainwindow.cpp
---- fritzing-0.6.4b.source.orig/src/mainwindow.cpp 2011-12-16 11:07:53.000000000 -0800
-+++ fritzing-0.6.4b.source/src/mainwindow.cpp 2011-12-16 15:48:37.100093735 -0800
-@@ -156,7 +156,6 @@
- m_windowMenuSeparator = NULL;
- m_wireColorMenu = NULL;
- m_viewSwitcherDock = NULL;
-- m_checkForUpdatesAct = NULL;
- m_fileProgressDialog = NULL;
- m_currentGraphicsView = NULL;
- m_comboboxChanged = false;
-@@ -1785,13 +1784,6 @@
- m_showInViewHelpAct->setChecked(show);
- }
-
--void MainWindow::enableCheckUpdates(bool enabled)
--{
-- if (m_checkForUpdatesAct != NULL) {
-- m_checkForUpdatesAct->setEnabled(enabled);
-- }
--}
--
- void MainWindow::swapSelectedDelay(const QString & family, const QString & prop, QMap<QString, QString> & currPropsMap, ItemBase * itemBase)
- {
- m_swapTimer.stop();
-diff -ur fritzing-0.6.4b.source.orig/src/mainwindow_menu.cpp fritzing-0.6.4b.source/src/mainwindow_menu.cpp
---- fritzing-0.6.4b.source.orig/src/mainwindow_menu.cpp 2011-12-16 11:07:53.000000000 -0800
-+++ fritzing-0.6.4b.source/src/mainwindow_menu.cpp 2011-12-16 15:47:18.968316261 -0800
-@@ -903,10 +903,6 @@
+diff -urP fritzing-0.7.0b.source.orig/src/mainwindow.cpp fritzing-0.7.0b.source/src/mainwindow.cpp
+--- fritzing-0.7.0b.source.orig/src/mainwindow.cpp 2012-02-03 12:19:35.000000000 -0800
++++ fritzing-0.7.0b.source/src/mainwindow.cpp 2012-02-03 17:40:53.161862774 -0800
+@@ -123,7 +123,6 @@
+ m_windowMenuSeparator = NULL;
+ m_wireColorMenu = NULL;
+ m_viewSwitcherDock = NULL;
+- m_checkForUpdatesAct = NULL;
+ m_fileProgressDialog = NULL;
+ m_currentGraphicsView = NULL;
+ m_comboboxChanged = false;
+@@ -1694,13 +1693,6 @@
+ m_showInViewHelpAct->setChecked(show);
+ }
+
+-void MainWindow::enableCheckUpdates(bool enabled)
+-{
+- if (m_checkForUpdatesAct != NULL) {
+- m_checkForUpdatesAct->setEnabled(enabled);
+- }
+-}
+-
+ void MainWindow::swapSelectedMap(const QString & family, const QString & prop, QMap<QString, QString> & currPropsMap, ItemBase * itemBase)
+ {
+ if (itemBase == NULL) return;
+diff -urP fritzing-0.7.0b.source.orig/src/mainwindow.h fritzing-0.7.0b.source/src/mainwindow.h
+--- fritzing-0.7.0b.source.orig/src/mainwindow.h 2012-02-03 12:19:30.000000000 -0800
++++ fritzing-0.7.0b.source/src/mainwindow.h 2012-02-03 17:42:26.071882893 -0800
+@@ -73,7 +73,6 @@
+ QSizeGrip *sizeGrip();
+ QStatusBar *realStatusBar();
+ void showAllFirstTimeHelp(bool show);
+- void enableCheckUpdates(bool enabled);
+
+ class PartsEditorMainWindow* getPartsEditor(ModelPart *modelPart, long id, ItemBase * fromItem, class PartsBinPaletteWidget* requester);
+ ModelPart *loadPartFromFile(const QString& newPartPath, bool connectorsChanged=false);
+@@ -639,7 +638,6 @@
+ QAction *m_partsRefAct;
+ QAction *m_showInViewHelpAct;;
+ QAction *m_visitFritzingDotOrgAct;
+- QAction *m_checkForUpdatesAct;
+ QAction *m_aboutQtAct;
+ QAction *m_reportBugAct;
+ QAction *m_enableDebugAct;
+diff -urP fritzing-0.7.0b.source.orig/src/mainwindow_menu.cpp fritzing-0.7.0b.source/src/mainwindow_menu.cpp
+--- fritzing-0.7.0b.source.orig/src/mainwindow_menu.cpp 2012-02-03 12:19:35.000000000 -0800
++++ fritzing-0.7.0b.source/src/mainwindow_menu.cpp 2012-02-03 17:40:15.543068719 -0800
+@@ -937,10 +937,6 @@
m_visitFritzingDotOrgAct->setStatusTip(tr("www.fritzing.org"));
connect(m_visitFritzingDotOrgAct, SIGNAL(triggered(bool)), this, SLOT(visitFritzingDotOrg()));*/
@@ -122,7 +141,7 @@ diff -ur fritzing-0.6.4b.source.orig/src/mainwindow_menu.cpp fritzing-0.6.4b.sou
m_aboutAct = new QAction(tr("&About"), this);
m_aboutAct->setStatusTip(tr("Show the application's about box"));
connect(m_aboutAct, SIGNAL(triggered()), this, SLOT(about()));
-@@ -1142,7 +1138,6 @@
+@@ -1177,7 +1173,6 @@
m_helpMenu->addAction(m_examplesAct);
m_helpMenu->addAction(m_partsRefAct);
m_helpMenu->addSeparator();
@@ -130,3 +149,18 @@ diff -ur fritzing-0.6.4b.source.orig/src/mainwindow_menu.cpp fritzing-0.6.4b.sou
m_helpMenu->addAction(m_importFilesFromPrevInstallAct);
m_helpMenu->addSeparator();
m_helpMenu->addAction(m_reportBugAct);
+diff -urP fritzing-0.7.0b.source.orig/translations/fritzing_de.ts fritzing-0.7.0b.source/translations/fritzing_de.ts
+--- fritzing-0.7.0b.source.orig/translations/fritzing_de.ts 2012-02-03 12:19:36.000000000 -0800
++++ fritzing-0.7.0b.source/translations/fritzing_de.ts 2012-02-03 17:42:46.750219710 -0800
+@@ -3214,11 +3214,6 @@
+ <translation>Notiz hinzufügen</translation>
+ </message>
+ <message>
+- <location filename="../src/mainwindow_menu.cpp" line="911"/>
+- <source>Check for updates...</source>
+- <translation>Nach Updates suchen...</translation>
+- </message>
+- <message>
+ <location filename="../src/mainwindow_menu.cpp" line="912"/>
+ <source>Check whether a newer version of Fritzing is available for download</source>
+ <translation>Überprüfen, ob eine neuere Fritzing-Version zum Download bereit steht</translation>
diff --git a/fritzing-use-external-libs.patch b/fritzing-use-external-libs.patch
index f0e7209..470fd99 100644
--- a/fritzing-use-external-libs.patch
+++ b/fritzing-use-external-libs.patch
@@ -1,6 +1,6 @@
-diff -ur fritzing-0.6.4b.source.orig/phoenix.pro fritzing-0.6.4b.source/phoenix.pro
---- fritzing-0.6.4b.source.orig/phoenix.pro 2011-12-16 11:07:53.000000000 -0800
-+++ fritzing-0.6.4b.source/phoenix.pro 2011-12-16 22:39:01.177898440 -0800
+diff -ur fritzing-0.7.0b.source.orig/phoenix.pro fritzing-0.7.0b.source/phoenix.pro
+--- fritzing-0.7.0b.source.orig/phoenix.pro 2012-02-03 12:19:35.000000000 -0800
++++ fritzing-0.7.0b.source/phoenix.pro 2012-02-03 17:46:14.021572371 -0800
@@ -106,7 +106,6 @@
RC_FILE = fritzing.rc
RESOURCES += phoenixresources.qrc
@@ -9,56 +9,358 @@ diff -ur fritzing-0.6.4b.source.orig/phoenix.pro fritzing-0.6.4b.source/phoenix.
include(pri/partsbinpalette.pri)
include(pri/partseditor.pri)
include(pri/referencemodel.pri)
-@@ -127,10 +126,10 @@
- include(pri/sketch.pri)
- include(pri/translations.pri)
- include(pri/program.pri)
-- include(pri/qtlockedfile.pri)
- include(pri/ff.pri)
- include(pri/qtsysteminfo.pri)
- TARGET = Fritzing
+@@ -133,3 +132,5 @@
TEMPLATE = app
--
+
+INCLUDEPATH += /usr/include/quazip /usr/include/minizip
+LIBS += -lquazip -lminizip
-diff -ur fritzing-0.6.4b.source.orig/pri/utils.pri fritzing-0.6.4b.source/pri/utils.pri
---- fritzing-0.6.4b.source.orig/pri/utils.pri 2011-12-16 11:07:50.000000000 -0800
-+++ fritzing-0.6.4b.source/pri/utils.pri 2011-12-16 22:38:33.222783983 -0800
-@@ -17,8 +17,6 @@
- # $Date: 2011-08-27 00:26:36 +0200 (Sat, 27 Aug 2011) $
+diff -ur fritzing-0.7.0b.source.orig/pri/utils.pri fritzing-0.7.0b.source/pri/utils.pri
+--- fritzing-0.7.0b.source.orig/pri/utils.pri 2012-02-03 12:19:29.000000000 -0800
++++ fritzing-0.7.0b.source/pri/utils.pri 2012-02-03 17:46:55.061256221 -0800
+@@ -17,7 +17,6 @@
+ # $Date: 2012-02-01 10:30:37 +0100 (Wed, 01 Feb 2012) $
# ********************************************************************/
-INCLUDEPATH += src/lib/boost_1_43_0
--
+
HEADERS += \
src/utils/abstractimagebutton.h \
- src/utils/abstractstatesbutton.h \
-diff -ur fritzing-0.6.4b.source.orig/src/fapplication.cpp fritzing-0.6.4b.source/src/fapplication.cpp
---- fritzing-0.6.4b.source.orig/src/fapplication.cpp 2011-12-16 11:07:52.000000000 -0800
-+++ fritzing-0.6.4b.source/src/fapplication.cpp 2011-12-16 22:38:33.223783951 -0800
-@@ -58,7 +58,7 @@
- #include "items/pinheader.h"
- #include "items/partfactory.h"
- #include "dialogs/recoverydialog.h"
--#include "lib/qtlockedfile/qtlockedfile.h"
-+#include <qtlockedfile.h>
- #include "lib/qtsysteminfo/QtSystemInfo.h"
- #include "processeventblocker.h"
- #include "autoroute/cmrouter/panelizer.h"
-diff -ur fritzing-0.6.4b.source.orig/src/utils/folderutils.cpp fritzing-0.6.4b.source/src/utils/folderutils.cpp
---- fritzing-0.6.4b.source.orig/src/utils/folderutils.cpp 2011-12-16 11:07:51.000000000 -0800
-+++ fritzing-0.6.4b.source/src/utils/folderutils.cpp 2011-12-16 22:38:33.223783951 -0800
-@@ -33,9 +33,9 @@
+diff -ur fritzing-0.7.0b.source.orig/src/utils/folderutils.cpp fritzing-0.7.0b.source/src/utils/folderutils.cpp
+--- fritzing-0.7.0b.source.orig/src/utils/folderutils.cpp 2012-02-03 12:19:35.000000000 -0800
++++ fritzing-0.7.0b.source/src/utils/folderutils.cpp 2012-02-03 17:47:49.573507791 -0800
+@@ -34,8 +34,8 @@
#include <QCryptographicHash>
#include "../debugdialog.h"
-#include "../lib/quazip/quazip.h"
-#include "../lib/quazip/quazipfile.h"
--#include "../lib/qtlockedfile/qtlockedfile.h"
+#include <quazip/quazip.h>
+#include <quazip/quazipfile.h>
-+#include <qtlockedfile.h>
#include "../lib/qtsysteminfo/QtSystemInfo.h"
+diff -ur fritzing-0.7.0b.source.orig/translations/fritzing_ar.ts fritzing-0.7.0b.source/translations/fritzing_ar.ts
+--- fritzing-0.7.0b.source.orig/translations/fritzing_ar.ts 2012-02-03 12:19:35.000000000 -0800
++++ fritzing-0.7.0b.source/translations/fritzing_ar.ts 2012-02-03 17:49:27.432565826 -0800
+@@ -5596,14 +5596,6 @@
+ </message>
+ </context>
+ <context>
+- <name>QuaZipFile</name>
+- <message>
+- <location filename="../src/lib/quazip/quazipfile.cpp" line="141"/>
+- <source>ZIP/UNZIP API error %1</source>
+- <translation type="unfinished"></translation>
+- </message>
+-</context>
+-<context>
+ <name>RecoveryDialog</name>
+ <message>
+ <location filename="../src/dialogs/recoverydialog.cpp" line="65"/>
+diff -ur fritzing-0.7.0b.source.orig/translations/fritzing_bg.ts fritzing-0.7.0b.source/translations/fritzing_bg.ts
+--- fritzing-0.7.0b.source.orig/translations/fritzing_bg.ts 2012-02-03 12:19:36.000000000 -0800
++++ fritzing-0.7.0b.source/translations/fritzing_bg.ts 2012-02-03 17:49:32.909390344 -0800
+@@ -5560,14 +5560,6 @@
+ </message>
+ </context>
+ <context>
+- <name>QuaZipFile</name>
+- <message>
+- <location filename="../src/lib/quazip/quazipfile.cpp" line="141"/>
+- <source>ZIP/UNZIP API error %1</source>
+- <translation type="unfinished"></translation>
+- </message>
+-</context>
+-<context>
+ <name>RecoveryDialog</name>
+ <message>
+ <location filename="../src/dialogs/recoverydialog.cpp" line="65"/>
+diff -ur fritzing-0.7.0b.source.orig/translations/fritzing_cs.ts fritzing-0.7.0b.source/translations/fritzing_cs.ts
+--- fritzing-0.7.0b.source.orig/translations/fritzing_cs.ts 2012-02-03 12:19:36.000000000 -0800
++++ fritzing-0.7.0b.source/translations/fritzing_cs.ts 2012-02-03 17:49:37.322248960 -0800
+@@ -5617,14 +5617,6 @@
+ </message>
+ </context>
+ <context>
+- <name>QuaZipFile</name>
+- <message>
+- <location filename="../src/lib/quazip/quazipfile.cpp" line="141"/>
+- <source>ZIP/UNZIP API error %1</source>
+- <translation>ZIP/UNZIP API chyba %1</translation>
+- </message>
+-</context>
+-<context>
+ <name>RecoveryDialog</name>
+ <message>
+ <location filename="../src/dialogs/recoverydialog.cpp" line="65"/>
+diff -ur fritzing-0.7.0b.source.orig/translations/fritzing_de.ts fritzing-0.7.0b.source/translations/fritzing_de.ts
+--- fritzing-0.7.0b.source.orig/translations/fritzing_de.ts 2012-02-03 17:51:50.163992903 -0800
++++ fritzing-0.7.0b.source/translations/fritzing_de.ts 2012-02-03 17:49:41.881102837 -0800
+@@ -5599,14 +5599,6 @@
+ </message>
+ </context>
+ <context>
+- <name>QuaZipFile</name>
+- <message>
+- <location filename="../src/lib/quazip/quazipfile.cpp" line="141"/>
+- <source>ZIP/UNZIP API error %1</source>
+- <translation>ZIP/UNZIP API-Fehler %1</translation>
+- </message>
+-</context>
+-<context>
+ <name>RecoveryDialog</name>
+ <message>
+ <location filename="../src/dialogs/recoverydialog.cpp" line="65"/>
+diff -ur fritzing-0.7.0b.source.orig/translations/fritzing_el.ts fritzing-0.7.0b.source/translations/fritzing_el.ts
+--- fritzing-0.7.0b.source.orig/translations/fritzing_el.ts 2012-02-03 12:19:36.000000000 -0800
++++ fritzing-0.7.0b.source/translations/fritzing_el.ts 2012-02-03 17:49:46.887942173 -0800
+@@ -5560,14 +5560,6 @@
+ </message>
+ </context>
+ <context>
+- <name>QuaZipFile</name>
+- <message>
+- <location filename="../src/lib/quazip/quazipfile.cpp" line="141"/>
+- <source>ZIP/UNZIP API error %1</source>
+- <translation type="unfinished"></translation>
+- </message>
+-</context>
+-<context>
+ <name>RecoveryDialog</name>
+ <message>
+ <location filename="../src/dialogs/recoverydialog.cpp" line="65"/>
+diff -ur fritzing-0.7.0b.source.orig/translations/fritzing_en.ts fritzing-0.7.0b.source/translations/fritzing_en.ts
+--- fritzing-0.7.0b.source.orig/translations/fritzing_en.ts 2012-02-03 12:19:35.000000000 -0800
++++ fritzing-0.7.0b.source/translations/fritzing_en.ts 2012-02-03 17:49:51.288801491 -0800
+@@ -5564,14 +5564,6 @@
+ </message>
+ </context>
+ <context>
+- <name>QuaZipFile</name>
+- <message>
+- <location filename="../src/lib/quazip/quazipfile.cpp" line="141"/>
+- <source>ZIP/UNZIP API error %1</source>
+- <translation type="unfinished"></translation>
+- </message>
+-</context>
+-<context>
+ <name>RecoveryDialog</name>
+ <message>
+ <location filename="../src/dialogs/recoverydialog.cpp" line="65"/>
+diff -ur fritzing-0.7.0b.source.orig/translations/fritzing_es.ts fritzing-0.7.0b.source/translations/fritzing_es.ts
+--- fritzing-0.7.0b.source.orig/translations/fritzing_es.ts 2012-02-03 12:19:36.000000000 -0800
++++ fritzing-0.7.0b.source/translations/fritzing_es.ts 2012-02-03 17:49:56.983619058 -0800
+@@ -5595,14 +5595,6 @@
+ </message>
+ </context>
+ <context>
+- <name>QuaZipFile</name>
+- <message>
+- <location filename="../src/lib/quazip/quazipfile.cpp" line="141"/>
+- <source>ZIP/UNZIP API error %1</source>
+- <translation>Error en la API ZIP/UNZIP %1</translation>
+- </message>
+-</context>
+-<context>
+ <name>RecoveryDialog</name>
+ <message>
+ <location filename="../src/dialogs/recoverydialog.cpp" line="65"/>
+diff -ur fritzing-0.7.0b.source.orig/translations/fritzing_et.ts fritzing-0.7.0b.source/translations/fritzing_et.ts
+--- fritzing-0.7.0b.source.orig/translations/fritzing_et.ts 2012-02-03 12:19:35.000000000 -0800
++++ fritzing-0.7.0b.source/translations/fritzing_et.ts 2012-02-03 17:50:01.539473087 -0800
+@@ -5560,14 +5560,6 @@
+ </message>
+ </context>
+ <context>
+- <name>QuaZipFile</name>
+- <message>
+- <location filename="../src/lib/quazip/quazipfile.cpp" line="141"/>
+- <source>ZIP/UNZIP API error %1</source>
+- <translation type="unfinished"></translation>
+- </message>
+-</context>
+-<context>
+ <name>RecoveryDialog</name>
+ <message>
+ <location filename="../src/dialogs/recoverydialog.cpp" line="65"/>
+diff -ur fritzing-0.7.0b.source.orig/translations/fritzing_fr.ts fritzing-0.7.0b.source/translations/fritzing_fr.ts
+--- fritzing-0.7.0b.source.orig/translations/fritzing_fr.ts 2012-02-03 12:19:36.000000000 -0800
++++ fritzing-0.7.0b.source/translations/fritzing_fr.ts 2012-02-03 17:50:05.864334500 -0800
+@@ -5576,14 +5576,6 @@
+ </message>
+ </context>
+ <context>
+- <name>QuaZipFile</name>
+- <message>
+- <location filename="../src/lib/quazip/quazipfile.cpp" line="141"/>
+- <source>ZIP/UNZIP API error %1</source>
+- <translation>ZIP/UNZIP erreur d'API %1</translation>
+- </message>
+-</context>
+-<context>
+ <name>RecoveryDialog</name>
+ <message>
+ <location filename="../src/dialogs/recoverydialog.cpp" line="65"/>
+diff -ur fritzing-0.7.0b.source.orig/translations/fritzing_gl.ts fritzing-0.7.0b.source/translations/fritzing_gl.ts
+--- fritzing-0.7.0b.source.orig/translations/fritzing_gl.ts 2012-02-03 12:19:36.000000000 -0800
++++ fritzing-0.7.0b.source/translations/fritzing_gl.ts 2012-02-03 17:50:10.364190355 -0800
+@@ -5560,14 +5560,6 @@
+ </message>
+ </context>
+ <context>
+- <name>QuaZipFile</name>
+- <message>
+- <location filename="../src/lib/quazip/quazipfile.cpp" line="141"/>
+- <source>ZIP/UNZIP API error %1</source>
+- <translation type="unfinished"></translation>
+- </message>
+-</context>
+-<context>
+ <name>RecoveryDialog</name>
+ <message>
+ <location filename="../src/dialogs/recoverydialog.cpp" line="65"/>
+diff -ur fritzing-0.7.0b.source.orig/translations/fritzing_hi.ts fritzing-0.7.0b.source/translations/fritzing_hi.ts
+--- fritzing-0.7.0b.source.orig/translations/fritzing_hi.ts 2012-02-03 12:19:35.000000000 -0800
++++ fritzing-0.7.0b.source/translations/fritzing_hi.ts 2012-02-03 17:50:14.829047268 -0800
+@@ -5560,14 +5560,6 @@
+ </message>
+ </context>
+ <context>
+- <name>QuaZipFile</name>
+- <message>
+- <location filename="../src/lib/quazip/quazipfile.cpp" line="141"/>
+- <source>ZIP/UNZIP API error %1</source>
+- <translation type="unfinished"></translation>
+- </message>
+-</context>
+-<context>
+ <name>RecoveryDialog</name>
+ <message>
+ <location filename="../src/dialogs/recoverydialog.cpp" line="65"/>
+diff -ur fritzing-0.7.0b.source.orig/translations/fritzing_hu.ts fritzing-0.7.0b.source/translations/fritzing_hu.ts
+--- fritzing-0.7.0b.source.orig/translations/fritzing_hu.ts 2012-02-03 12:19:36.000000000 -0800
++++ fritzing-0.7.0b.source/translations/fritzing_hu.ts 2012-02-03 17:50:19.585895025 -0800
+@@ -5551,14 +5551,6 @@
+ </message>
+ </context>
+ <context>
+- <name>QuaZipFile</name>
+- <message>
+- <location filename="../src/lib/quazip/quazipfile.cpp" line="141"/>
+- <source>ZIP/UNZIP API error %1</source>
+- <translation type="unfinished"></translation>
+- </message>
+-</context>
+-<context>
+ <name>RecoveryDialog</name>
+ <message>
+ <location filename="../src/dialogs/recoverydialog.cpp" line="65"/>
+diff -ur fritzing-0.7.0b.source.orig/translations/fritzing_ko.ts fritzing-0.7.0b.source/translations/fritzing_ko.ts
+--- fritzing-0.7.0b.source.orig/translations/fritzing_ko.ts 2012-02-03 12:19:36.000000000 -0800
++++ fritzing-0.7.0b.source/translations/fritzing_ko.ts 2012-02-03 17:50:32.138492731 -0800
+@@ -5604,14 +5604,6 @@
+ </message>
+ </context>
+ <context>
+- <name>QuaZipFile</name>
+- <message>
+- <location filename="../src/lib/quazip/quazipfile.cpp" line="141"/>
+- <source>ZIP/UNZIP API error %1</source>
+- <translation>ZIP/UNZIP API 에러 %1</translation>
+- </message>
+-</context>
+-<context>
+ <name>RecoveryDialog</name>
+ <message>
+ <location filename="../src/dialogs/recoverydialog.cpp" line="65"/>
+diff -ur fritzing-0.7.0b.source.orig/translations/fritzing_pl.ts fritzing-0.7.0b.source/translations/fritzing_pl.ts
+--- fritzing-0.7.0b.source.orig/translations/fritzing_pl.ts 2012-02-03 12:19:35.000000000 -0800
++++ fritzing-0.7.0b.source/translations/fritzing_pl.ts 2012-02-03 17:50:38.441290838 -0800
+@@ -5569,14 +5569,6 @@
+ </message>
+ </context>
+ <context>
+- <name>QuaZipFile</name>
+- <message>
+- <location filename="../src/lib/quazip/quazipfile.cpp" line="141"/>
+- <source>ZIP/UNZIP API error %1</source>
+- <translation type="unfinished"></translation>
+- </message>
+-</context>
+-<context>
+ <name>RecoveryDialog</name>
+ <message>
+ <location filename="../src/dialogs/recoverydialog.cpp" line="65"/>
+diff -ur fritzing-0.7.0b.source.orig/translations/fritzing_ro.ts fritzing-0.7.0b.source/translations/fritzing_ro.ts
+--- fritzing-0.7.0b.source.orig/translations/fritzing_ro.ts 2012-02-03 12:19:36.000000000 -0800
++++ fritzing-0.7.0b.source/translations/fritzing_ro.ts 2012-02-03 17:50:46.798022997 -0800
+@@ -5569,14 +5569,6 @@
+ </message>
+ </context>
+ <context>
+- <name>QuaZipFile</name>
+- <message>
+- <location filename="../src/lib/quazip/quazipfile.cpp" line="141"/>
+- <source>ZIP/UNZIP API error %1</source>
+- <translation type="unfinished"></translation>
+- </message>
+-</context>
+-<context>
+ <name>RecoveryDialog</name>
+ <message>
+ <location filename="../src/dialogs/recoverydialog.cpp" line="65"/>
+diff -ur fritzing-0.7.0b.source.orig/translations/fritzing_sv.ts fritzing-0.7.0b.source/translations/fritzing_sv.ts
+--- fritzing-0.7.0b.source.orig/translations/fritzing_sv.ts 2012-02-03 12:19:36.000000000 -0800
++++ fritzing-0.7.0b.source/translations/fritzing_sv.ts 2012-02-03 17:51:03.179498547 -0800
+@@ -5560,14 +5560,6 @@
+ </message>
+ </context>
+ <context>
+- <name>QuaZipFile</name>
+- <message>
+- <location filename="../src/lib/quazip/quazipfile.cpp" line="141"/>
+- <source>ZIP/UNZIP API error %1</source>
+- <translation type="unfinished"></translation>
+- </message>
+-</context>
+-<context>
+ <name>RecoveryDialog</name>
+ <message>
+ <location filename="../src/dialogs/recoverydialog.cpp" line="65"/>
+diff -ur fritzing-0.7.0b.source.orig/translations/fritzing_tr.ts fritzing-0.7.0b.source/translations/fritzing_tr.ts
+--- fritzing-0.7.0b.source.orig/translations/fritzing_tr.ts 2012-02-03 12:19:35.000000000 -0800
++++ fritzing-0.7.0b.source/translations/fritzing_tr.ts 2012-02-03 17:51:15.578101010 -0800
+@@ -5551,14 +5551,6 @@
+ </message>
+ </context>
+ <context>
+- <name>QuaZipFile</name>
+- <message>
+- <location filename="../src/lib/quazip/quazipfile.cpp" line="141"/>
+- <source>ZIP/UNZIP API error %1</source>
+- <translation type="unfinished"></translation>
+- </message>
+-</context>
+-<context>
+ <name>RecoveryDialog</name>
+ <message>
+ <location filename="../src/dialogs/recoverydialog.cpp" line="65"/>
+diff -ur fritzing-0.7.0b.source.orig/translations/fritzing_zh_tw.ts fritzing-0.7.0b.source/translations/fritzing_zh_tw.ts
+--- fritzing-0.7.0b.source.orig/translations/fritzing_zh_tw.ts 2012-02-03 12:19:36.000000000 -0800
++++ fritzing-0.7.0b.source/translations/fritzing_zh_tw.ts 2012-02-03 17:51:22.681873394 -0800
+@@ -5584,14 +5584,6 @@
+ </message>
+ </context>
+ <context>
+- <name>QuaZipFile</name>
+- <message>
+- <location filename="../src/lib/quazip/quazipfile.cpp" line="141"/>
+- <source>ZIP/UNZIP API error %1</source>
+- <translation>壓縮/解壓縮 API 錯誤 %1</translation>
+- </message>
+-</context>
+-<context>
+ <name>RecoveryDialog</name>
+ <message>
+ <location filename="../src/dialogs/recoverydialog.cpp" line="65"/>
diff --git a/fritzing.spec b/fritzing.spec
index 89b6830..ffa2882 100644
--- a/fritzing.spec
+++ b/fritzing.spec
@@ -1,7 +1,7 @@
Name: fritzing
-Version: 0.6.5b
-Release: 2%{?dist}
+Version: 0.7.0b
+Release: 1%{?dist}
Summary: Electronic Design Automation software; from prototype to product
Group: Applications/Engineering
@@ -16,8 +16,10 @@ Patch0: fritzing-use-external-libs.patch
Patch1: fritzing-disable-autoupdate.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: qt4-devel qt-webkit-devel desktop-file-utils boost-devel quazip-devel minizip-devel qtlockedfile-devel
+BuildRequires: qt4-devel qt-webkit-devel desktop-file-utils boost-devel quazip-devel minizip-devel
Requires: electronics-menu
+Requires: google-droid-sans-fonts
+Requires: google-droid-sans-mono-fonts
%description
Fritzing is an open-source initiative to support designers, artists,
@@ -29,9 +31,7 @@ prototypes, and to create a PCB layout for manufacturing.
%prep
%setup -q -n %{name}-%{version}.source
rm -f pri/quazip.pri
-rm -f pri/qtlockedfile.pri
rm -rf src/lib/boost_1_43_0
-rm -rf src/lib/qtlockedfile
rm -rf src/lib/quazip
%{__sed} -i 's/\r//' README.txt
@@ -40,8 +40,6 @@ rm -rf src/lib/quazip
%patch0 -p1
%patch1 -p1
-echo 'CONFIG *= %{_qt4_prefix}/mkspecs/features/qtlockedfile' >> phoenix.pro
-
%build
CXXFLAGS="%{optflags}"
%{_qt4_qmake}
@@ -75,6 +73,10 @@ rm -rf %{buildroot}
%{_mandir}/man?/*
%changelog
+* Fri Feb 3 2012 Ed Marshall <esm at logic.net> - 0.7.0b-1
+- Add Droid font requirement.
+- Updated to 0.7.0b release.
+
* Wed Jan 4 2012 Ed Marshall <esm at logic.net> - 0.6.5b-2
- Make rpmlint happier with line-endings on documentation.
diff --git a/sources b/sources
index 4cdd06d..2081838 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8ea0765b8fd31874da0ee00515a68576 fritzing-0.6.5b.source.tar.bz2
+9f4433db7d17b59aa46f3abcf8aaee45 fritzing-0.7.0b.source.tar.bz2
More information about the scm-commits
mailing list