pool/fritzing
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 77426 from home:Heinervdm:branches:Education

Browse Source 
- Fix fritzing-fix-app-folder.patch
- Apply patch to debian packages too
- put fritzing icon in correct directory for debian packages

OBS-URL: https://build.opensuse.org/request/show/77426
OBS-URL: https://build.opensuse.org/package/show/Education/fritzing?expand=0&rev=4
This commit is contained in:
andrea florio 2011-07-29 14:42:45 +00:00 committed by Git OBS Bridge
parent fd7d41f149
commit 4e16f39cae
6 changed files with 41 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
debian.changelog
View File

@ -1,3 +1,13 @@
fritzing (0.6.2b-4) stable; urgency=low
* Fix fritzing-fix-app-folder.patch to apply cleanly for all packages
-- Thomas Zimmermann <bugs@vdm-design.de> Fri, 29 Jul 2011 13:25:00 +0200
fritzing (0.6.2b-3) stable; urgency=low
* Add patch to fix the search path for shared data
-- Thomas Zimmermann <bugs@vdm-design.de> Thu, 28 Jul 2011 23:11:30 +0200
fritzing (0.6.2b-2) stable; urgency=low fritzing (0.6.2b-2) stable; urgency=low
* Add parts, manpage and desktop link to package * Add parts, manpage and desktop link to package

2
debian.install
View File

@ -2,6 +2,6 @@ fritzing /usr/bin
bins /usr/share/fritzing bins /usr/share/fritzing
sketches /usr/share/fritzing sketches /usr/share/fritzing
parts /usr/share/fritzing parts /usr/share/fritzing
resources/images/fritzing_icon.png /usr/share/pixmaps resources/images/fritzing_icon.png /usr/share/icons
fritzing.1 /usr/share/man/man1 fritzing.1 /usr/share/man/man1
fritzing.desktop /usr/share/applications fritzing.desktop /usr/share/applications

1
debian.series Normal file
View File

@ -0,0 +1 @@
fritzing-fix-app-folder.patch -p1

43
fritzing-fix-app-folder.patch
View File

@ -1,22 +1,21 @@
Index: src/utils/folderutils.cpp 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
--- src/utils/folderutils.cpp.orig +++ fritzing.2011.07.11.source/src/utils/folderutils.cpp 2011-07-29 11:06:55.000000000 +0200
+++ src/utils/folderutils.cpp @@ -154,11 +154,14 @@
@@ -153,11 +153,14 @@ const QString FolderUtils::libraryPath() }
}
const QString FolderUtils::applicationDirPath() {
const QString FolderUtils::applicationDirPath() { - if (m_appPath.isEmpty()) {
- if (m_appPath.isEmpty()) { - return QCoreApplication::applicationDirPath();
- return QCoreApplication::applicationDirPath(); + if (!m_appPath.isEmpty()) {
+ if (!m_appPath.isEmpty()) { + return m_appPath;
+ return m_appPath; }
}
- return m_appPath;
- return m_appPath; + QDir dir("/usr/share/fritzing");
+ QDir dir("/usr/share/fritzing"); + if (dir.exists()) return dir.path();
+ if (dir.exists()) return dir.path(); +
+ + return QCoreApplication::applicationDirPath();
+ return QCoreApplication::applicationDirPath(); }
}
bool FolderUtils::setApplicationPath2(const QString & path)
bool FolderUtils::setApplicationPath2(const QString & path)

6
fritzing.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Jul 28 21:09:30 UTC 2011 - bugs@vdm-design.de
- updated to 0.6.2b
- add packages for ubuntu and fedora
------------------------------------------------------------------- -------------------------------------------------------------------
Mon May 30 12:20:56 UTC 2011 - prusnak@opensuse.org Mon May 30 12:20:56 UTC 2011 - prusnak@opensuse.org

5
fritzing.spec
View File

@ -16,7 +16,7 @@ Source1: fritzing.desktop
Source2: fritzing.1 Source2: fritzing.1
# Fedora-specific patch to relocate shared data for system-wide install; # Fedora-specific patch to relocate shared data for system-wide install;
# will require a more thorough approach from the Fritzing team eventually. # will require a more thorough approach from the Fritzing team eventually.
#Patch0: fritzing-fix-app-folder.patch Patch0: fritzing-fix-app-folder.patch
BuildRequires: desktop-file-utils BuildRequires: desktop-file-utils
BuildRequires: libqt4-devel BuildRequires: libqt4-devel
%if 0%{?fedora} %if 0%{?fedora}
@ -34,9 +34,8 @@ prototypes, and to create a PCB layout for manufacturing.
%prep %prep
%setup -q -n %{name}.%{snap}.source %setup -q -n %{name}.%{snap}.source
sed -i "s|getUserDataStorePath("bins")|getUserDataStorePath("%{_datadir}/%{name}/bins")|" src/fapplication.cpp
sed -i 's/\r//' README.txt sed -i 's/\r//' README.txt
#%patch0 %patch0 -p1
%build %build
%if 0%{?mandriva_version} %if 0%{?mandriva_version}