Packman Build Service PMBS

guayadeque.changes Changed

guayadeque.spec Changed

@@ -16,33 +16,35 @@
 # Please submit bugfixes or comments via http://bugs.links2linux.org
 #
 
-
 Name:           guayadeque
-Version:        0.3.7
-Release:        0.pm.1
+Version:        0.6.1
+Release:        0
 Summary:        Guayadeque Music Player
 License:        GPL-3.0+
-Group:          Productivity/Multimedia/Sound/Players
-Url:            http://guayadeque.org
-Source:         http://prdownloads.sourceforge.net/guayadeque/guayadeque-%{version}.tar.bz2
-BuildRequires:  autoconf
-BuildRequires:  automake
-BuildRequires:  cmake
-BuildRequires:  dbus-1-devel
+ExclusiveArch:  aarch64 x86_64
+URL:            https://github.com/thothix/guayadeque
+Source:         %name-%version.tar.xz
+Patch0:         guayadeque.patch
 BuildRequires:  gcc-c++
-BuildRequires:  glibc-devel
-BuildRequires:  gstreamer-0_10-devel
-BuildRequires:  libcurl-devel
-BuildRequires:  libgnutls-devel
-BuildRequires:  libgpod-devel
-BuildRequires:  libtag-devel
-BuildRequires:  libtool
-BuildRequires:  make
 BuildRequires:  pkgconfig
-BuildRequires:  sqlite3-devel
 BuildRequires:  update-desktop-files
-BuildRequires:  wxWidgets-ansi-devel
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+
+BuildRequires:  gettext-tools
+BuildRequires:  cmake
+BuildRequires:  make
+BuildRequires:  pkgconfig(dbus-1)
+BuildRequires:  pkgconfig(gdk-pixbuf-2.0)
+BuildRequires:  pkgconfig(gio-2.0)
+BuildRequires:  pkgconfig(gstreamer-1.0)
+BuildRequires:  pkgconfig(gstreamer-pbutils-1.0)
+BuildRequires:  pkgconfig(gstreamer-tag-1.0)
+BuildRequires:  pkgconfig(jsoncpp)
+BuildRequires:  pkgconfig(libcurl)
+BuildRequires:  pkgconfig(libgpod-1.0)
+BuildRequires:  pkgconfig(sqlite3)
+BuildRequires:  pkgconfig(taglib)
+BuildRequires:  pkgconfig(wxsqlite3)
+BuildRequires:  wxWidgets-3_2-devel
 
 %description
 Guayadeque is a music management program designed for all music enthusiasts. It
@@ -50,37 +52,25 @@
 and uses the Gstreamer media framework.
 
 %prep
-%setup -q
-find . -type f -name CMakeCache.txt -delete
+%autosetup -p1
 
 %build
-install -d b
-pushd b
-# FIXME: you should use %%cmake macros
-cmake \
-    -DCMAKE_VERBOSE_MAKEFILE=TRUE \
-    -DCMAKE_INSTALL_PREFIX="%{_prefix}" \
-    -DCMAKE_SKIP_RPATH=TRUE \
-    -DCMAKE_BUILD_WITH_INSTALL_RPATH=FALSE \
-    ..
-make %{?_smp_mflags}
-popd
+CXXFLAGS='%optflags -Wno-deprecated-declarations'
+%cmake
+%cmake_build
 
 %install
-pushd b
-make DESTDIR=%{buildroot} install %{?_smp_mflags}
-popd
-
-%suse_update_desktop_file -r "%{name}" AudioVideo Player
+%cmake_install
+%suse_update_desktop_file -r 'org.guayadeque.guayadeque' AudioVideo Player
 
-%find_lang "%{name}"
+%find_lang %name
 
-%files -f "%{name}.lang"
-%defattr(-,root,root)
-%doc changelog LICENSE README
-%{_bindir}/guayadeque
-%{_datadir}/guayadeque
-%{_datadir}/applications/guayadeque.desktop
-%{_datadir}/pixmaps/guayadeque.png
+%files -f %name.lang
+%license LICENSE
+%_bindir/*
+%_datadir/guayadeque
+%_datadir/applications/*
+%_datadir/icons/*/*/apps/*
+%_datadir/metainfo/*
 
 %changelog

guayadeque.patch Added

@@ -0,0 +1,57 @@
+---
+ CMakeLists.txt  |    5 -----
+ src/MainApp.cpp |   15 ---------------
+ 2 files changed, 20 deletions(-)
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -22,11 +22,6 @@
+ 
+ find_package(PkgConfig REQUIRED)
+ 
+-set(SEARCH_LIBS /usr/lib /usr/local/lib)
+-
+-# sl 2020-05-23 according to https://cmake.org/cmake/help/v3.0/module/FindwxWidgets.html
+-set(wxWidgets_CONFIG_OPTIONS --toolkit=gtk3)
+-
+ find_package(wxWidgets COMPONENTS base core adv net html xml aui qa)
+ 
+ if (NOT wxWidgets_FOUND)
+--- a/src/MainApp.cpp
++++ b/src/MainApp.cpp
+@@ -108,11 +108,6 @@
+             wxCopyFile( wxT( DATADIR "/guayadeque.default.conf" ),
+                         guPATH_CONFIG_FILENAME, false );
+         }
+-        else if( wxFileExists( wxT( "/usr/local/share/guayadeque/guayadeque.default.conf" ) ) )
+-        {
+-            wxCopyFile( wxT( "/usr/local/share/guayadeque/guayadeque.default.conf" ),
+-                        guPATH_CONFIG_FILENAME, false );
+-        }
+         guLogMessage( wxT( "Created the default configuration file" ) );
+     }
+ 
+@@ -123,11 +118,6 @@
+             wxCopyFile( wxT( DATADIR "/equalizers.default.conf" ),
+                         guPATH_EQUALIZERS_FILENAME, false );
+         }
+-        else if( wxFileExists( wxT( "/usr/local/share/guayadeque/equalizers.default.conf" ) ) )
+-        {
+-            wxCopyFile( wxT( "/usr/local/share/guayadeque/equalizers.default.conf" ),
+-                        guPATH_EQUALIZERS_FILENAME, false );
+-        }
+         guLogMessage( wxT( "Created the default equalizers file" ) );
+     }
+ 
+@@ -138,11 +128,6 @@
+             wxCopyFile( wxT( DATADIR "/lyrics_sources.xml" ),
+                         guPATH_LYRICS_SOURCES_FILENAME, false );
+         }
+-        else if( wxFileExists( wxT( "/usr/local/share/guayadeque/lyrics_sources.xml" ) ) )
+-        {
+-            wxCopyFile( wxT( "/usr/local/share/guayadeque/lyrics_sources.xml" ),
+-                        guPATH_LYRICS_SOURCES_FILENAME, false );
+-        }
+         guLogMessage( wxT( "Created the default lyrics sources file" ) );
+     }
+

_service Added

@@ -0,0 +1,30 @@
+<services>
+  <service name="tar_scm" mode="manual">
+    <param name="exclude">.github</param>
+    <param name="exclude">.gitignore</param>
+    <param name="exclude">.tx</param>
+    <param name="exclude">Changelog.md</param>
+    <param name="exclude">Changelog</param>
+    <param name="exclude">INSTALL.md</param>
+    <param name="exclude">RADIOS.md</param>
+    <param name="exclude">README.md</param>
+    <param name="exclude">README</param>
+    <param name="exclude">build</param>
+    <param name="exclude">buildd</param>
+    <param name="exclude">buildt</param>
+    <param name="exclude">guayadeque</param>
+    <param name="filename">guayadeque</param>
+    <param name="revision">9f06f00b8dce0027a85dc6f6eb6c4e1a9506a778</param>
+    <param name="scm">git</param>
+    <param name="submodules">disable</param>
+    <param name="url">https://github.com/thothix/guayadeque.git</param>
+    <param name="versionformat">@PARENT_TAG@</param>
+    <param name="versionrewrite-pattern">v?(^++)(.*)</param>
+    <param name="versionrewrite-replacement">\1</param>
+  </service>
+  <service name="recompress" mode="manual">
+    <param name="file">*.tar</param>
+    <param name="compression">xz</param>
+  </service>
+  <service name="set_version" mode="manual"/>
+</services>

guayadeque-0.3.7.tar.bz2 -> guayadeque-0.6.1.tar.xz Changed

Changes of Revision 3