Notification time stamped 2018-10-01 03:24:11 UTC
From 6b8272b3a8436adf033f48772526ef59f450d5db Mon Sep 17 00:00:00 2001
From: Ed Marshall <esm(a)logic.net>
Date: Oct 01 2018 03:23:39 +0000
Subject: Update qt5 dependencies, fix zlib/minizip dependency.
---
diff --git a/fritzing-quazip5.patch b/fritzing-quazip5.patch
index 65da664..7eae8c8 100644
--- a/fritzing-quazip5.patch
+++ b/fritzing-quazip5.patch
@@ -7,8 +7,8 @@ diff -urN fritzing-0.9.0b.source.orig/phoenix.pro
fritzing-0.9.0b.source/phoenix
contains(DEFINES, QUAZIP_INSTALLED) {
- INCLUDEPATH += /usr/include/quazip /usr/include/minizip
- LIBS += -lquazip -lminizip
-+ INCLUDEPATH += /usr/include/quazip5 /usr/include/minizip
-+ LIBS += -lquazip5 -lminizip
++ INCLUDEPATH += /usr/include/quazip5
++ LIBS += -lquazip5
}
TARGET = Fritzing
diff --git a/fritzing.spec b/fritzing.spec
index 3559f5c..45fa5e3 100644
--- a/fritzing.spec
+++ b/fritzing.spec
@@ -1,6 +1,6 @@
Name: fritzing
Version: 0.9.2b
-Release: 16%{?dist}
+Release: 17%{?dist}
Summary: Electronic Design Automation software; from prototype to product
Group: Applications/Engineering
@@ -20,9 +20,23 @@ Patch2: fritzing-parts-fix-python.patch
# Remove references to example sketches that use twitter4j library
Patch3: fritzing-remove-twitter4j.patch
-BuildRequires: qt5-qtbase-devel qt5-qtwebkit-devel boost-devel quazip-qt5-devel
-BuildRequires: minizip-compat-devel qt5-qtsvg-devel qt5-qtserialport-devel
-BuildRequires: desktop-file-utils libappstream-glib gcc-c++
+BuildRequires: pkgconfig(Qt5Concurrent)
+BuildRequires: pkgconfig(Qt5Core)
+BuildRequires: pkgconfig(Qt5Gui)
+BuildRequires: pkgconfig(Qt5Network)
+BuildRequires: pkgconfig(Qt5PrintSupport)
+BuildRequires: pkgconfig(Qt5SerialPort)
+BuildRequires: pkgconfig(Qt5Sql)
+BuildRequires: pkgconfig(Qt5Svg)
+BuildRequires: pkgconfig(Qt5Widgets)
+BuildRequires: pkgconfig(Qt5Xml)
+
+# Have to manually specify zlib dependency here for now (BZ#1634468)
+BuildRequires: quazip-qt5-devel
+BuildRequires: pkgconfig(zlib)
+
+BuildRequires: desktop-file-utils libappstream-glib gcc-c++ boost-devel
+
Requires: electronics-menu
Requires: google-droid-sans-fonts
Requires: google-droid-sans-mono-fonts
@@ -84,6 +98,10 @@ appstream-util validate-relax --nonet
%{buildroot}/%{_datadir}/appdata/fritzing.
%{_mandir}/man?/*
%changelog
+* Sun Sep 30 2018 Ed Marshall <esm(a)logic.net> - 0.9.2b-16
+- Update Qt5 dependencies, remove unnecessary dependency on minizip.
+- Add zlib-devel dependency for now.
+
* Tue Sep 04 2018 Pavel Raiskup <praiskup(a)redhat.com> - 0.9.2b-16
- rebuild against minizip-compat-devel, rhbz#1609830, rhbz#1615381
https://src.fedoraproject.org/rpms/fritzing/c/6b8272b3a8436adf033f4877252...