Version: 0.4.1

diff --git a/qjackctl-locale.patch b/qjackctl-locale.patch
deleted file mode 100644 (file)
index 8afcc8c..0000000
--- a/qjackctl-locale.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- qjackctl-0.3.7/Makefile.in.orig    2010-08-23 18:27:45.000000000 +0200
-+++ qjackctl-0.3.7/Makefile.in 2011-04-18 12:20:53.506064376 +0200
-@@ -103,7 +103,12 @@
-       @make INSTALL_ROOT=$(DESTDIR) -f $(name).mak install
-       @install -d -v -m 0755 $(DESTDIR)$(prefix)/share/locale
-       @install -d -v -m 0755 $(DESTDIR)$(prefix)/share/man/man1
--      @install -v -m 0644 $(translations_targets) $(DESTDIR)$(prefix)/share/locale
-+      @for f in $(translations_targets) ; do \
-+              ff=`basename $$f .qm` ; \
-+              ll=$${ff##*_} ; \
-+              install -d -v -m 0755 $(DESTDIR)$(prefix)/share/locale/$$ll/LC_MESSAGES ; \
-+              install -v -m 0644 $$f $(DESTDIR)$(prefix)/share/locale/$$ll/LC_MESSAGES/qjackctl.qm ; \
-+      done
-       @install -v -m 0644 $(name).1 $(DESTDIR)$(prefix)/share/man/man1/$(name).1
- 
- uninstall:    $(DESTDIR)$(prefix)/bin/$(name)

diff --git a/qjackctl-qt4.patch b/qjackctl-qt4.patch
deleted file mode 100644 (file)
index 9c0ba93..0000000
--- a/qjackctl-qt4.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- qjackctl-0.3.2/configure.ac~       2008-01-06 20:33:35.218713393 +0100
-+++ qjackctl-0.3.2/configure.ac        2008-01-06 20:36:27.880771328 +0100
-@@ -89,7 +89,7 @@
-   if test -d $X/bin; then
-     ac_path="$X/bin:$ac_path"
-   fi
--  if test -x $X/qmake; then
-+  if test -x $X/qmake-qt4; then
-     ac_path="$X:$ac_path"
-   fi
-   if test -d $X/include; then
-@@ -132,23 +132,23 @@
- ac_errmsg="not found in current PATH. Maybe QT development environment isn't available (qt-devel)."
- 
- # Check for Qt qmake utility.
--AC_PATH_PROG(ac_qmake, qmake, [no], $ac_path)
-+AC_PATH_PROG(ac_qmake, qmake-qt4, [no], $ac_path)
- if test "x$ac_qmake" = "xno"; then
--   AC_MSG_ERROR([qmake $ac_errmsg])
-+   AC_MSG_ERROR([qmake-qt4 $ac_errmsg])
- fi
- AC_SUBST(ac_qmake)
- 
- # Check for Qt moc utility.
--AC_PATH_PROG(ac_moc, moc, [no], $ac_path)
-+AC_PATH_PROG(ac_moc, moc-qt4, [no], $ac_path)
- if test "x$ac_moc" = "xno"; then
--   AC_MSG_ERROR([moc $ac_errmsg])
-+   AC_MSG_ERROR([moc-qt4 $ac_errmsg])
- fi
- AC_SUBST(ac_moc)
- 
- # Check for Qt uic utility.
--AC_PATH_PROG(ac_uic, uic, [no], $ac_path)
-+AC_PATH_PROG(ac_uic, uic-qt4, [no], $ac_path)
- if test "x$ac_uic" = "xno"; then
--   AC_MSG_ERROR([uic $ac_errmsg])
-+   AC_MSG_ERROR([uic-qt4 $ac_errmsg])
- fi
- AC_SUBST(ac_uic)
- 

diff --git a/qjackctl.spec b/qjackctl.spec
index e5bef8fdeb8e576476ed79de3eac675a1ebcd6e2..16545343d333a14a7de04250cd22f682402c9b6d 100644 (file)
--- a/qjackctl.spec
+++ b/qjackctl.spec
@@ -1,26 +1,25 @@
 Summary:       Simple application to control the JACK server
 Summary(pl.UTF-8):     Prosty program do kontrolowania serwera JACK-a
 Name:          qjackctl
-Version:       0.3.8
-Release:       2
+Version:       0.4.1
+Release:       1
 License:       GPL
 Group:         X11/Applications/Sound
-Source0:       http://dl.sourceforge.net/qjackctl/%{name}-%{version}.tar.gz
-# Source0-md5: 8a0992c01e50d8be22064ab7b08fbc78
+Source0:       http://downloads.sourceforge.net/qjackctl/%{name}-%{version}.tar.gz
+# Source0-md5: 6a0a4245e2b9e470e04009e1d0f29f08
 Source1:       %{name}.desktop
-Patch0:                %{name}-qt4.patch
-Patch1:                %{name}-locale.patch
 URL:           http://qjackctl.sourceforge.net
-BuildRequires: QtDBus-devel
-BuildRequires: QtGui-devel
-BuildRequires: QtXml-devel
+BuildRequires: Qt5DBus-devel
+BuildRequires: Qt5Gui-devel
+BuildRequires: Qt5X11Extras-devel
+BuildRequires: Qt5Xml-devel
 BuildRequires: alsa-lib-devel
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: jack-audio-connection-kit-devel >= 0.118.3
-BuildRequires: qt4-build
-BuildRequires: qt4-linguist
-BuildRequires: qt4-qmake >= 4.3.3-3
+BuildRequires: qt5-build
+BuildRequires: qt5-linguist
+BuildRequires: qt5-qmake >= 4.3.3-3
 BuildRequires: sed >= 4.0
 Provides:      jack-patch-bay
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -35,8 +34,6 @@ Posiada proste GUI dla ustawiania poszczególnych parametrów JACK-a.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
 
 %build
 %{__aclocal}
@@ -66,3 +63,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_desktopdir}/*.desktop
 %{_iconsdir}/hicolor/*/apps/%{name}.png
 %{_mandir}/man1/qjackctl.1*
+%{_datadir}/appdata/%{name}.appdata.xml
+%dir %{_datadir}/%{name}
+%dir %{_datadir}/%{name}/translations