commit 6eb323ccbe0c22614b359a6ce7ed31872b3eec6e
Author: Jakub Bogusz <[email protected]>
Date: Mon Dec 10 18:39:34 2018 +0100
- updated to 0.8.15; now used meson and defaults to gtksourceview4
- updated desktop patch
gupnp-tools-desktop.patch | 36 ++++++++++++++++++------------------
gupnp-tools.spec | 33 ++++++++++++++-------------------
2 files changed, 32 insertions(+), 37 deletions(-)
---
diff --git a/gupnp-tools.spec b/gupnp-tools.spec
index e937f6f..87cdc87 100644
--- a/gupnp-tools.spec
+++ b/gupnp-tools.spec
@@ -1,35 +1,34 @@
Summary: GUPnP Tools
Summary(pl.UTF-8): Narzędzia GUPnP
Name: gupnp-tools
-Version: 0.8.14
+Version: 0.8.15
Release: 1
License: GPL v2+
Group: X11/Applications
Source0:
http://ftp.gnome.org/pub/GNOME/sources/gupnp-tools/0.8/%{name}-%{version}.tar.xz
-# Source0-md5: 4423ed8164250e7518f135458069b0f7
+# Source0-md5: c3ea447a682a3431494093efa419b00a
Patch0: %{name}-desktop.patch
URL: http://gupnp.org/
-BuildRequires: autoconf >= 2.63
-BuildRequires: automake >= 1:1.11
BuildRequires: gettext-tools >= 0.19.7
BuildRequires: glib2-devel >= 1:2.24
BuildRequires: gssdp-devel >= 0.14
BuildRequires: gtk+3-devel >= 3.10.0
-BuildRequires: gtksourceview3-devel >= 3.2.0
+BuildRequires: gtksourceview4-devel >= 4
BuildRequires: gupnp-av-devel >= 0.5.5
BuildRequires: gupnp-devel >= 0.20.14
BuildRequires: libsoup-devel >= 2.42
-BuildRequires: libtool >= 2:2.2
BuildRequires: libuuid-devel
BuildRequires: libxml2-devel >= 2.0
+BuildRequires: meson
+BuildRequires: ninja
BuildRequires: pkgconfig
+BuildRequires: rpmbuild(macros) >= 1.727
BuildRequires: tar >= 1:1.22
BuildRequires: xz
Requires: adwaita-icon-theme
Requires: glib2 >= 1:2.24
Requires: gssdp >= 0.14
Requires: gtk+3 >= 3.10.0
-Requires: gtksourceview3 >= 3.2.0
Requires: gupnp-av >= 0.5.5
Requires: gupnp >= 0.20.14
Requires: libsoup >= 2.42
@@ -85,21 +84,14 @@ UPnP:
%patch0 -p1
%build
-%{__gettextize}
-%{__libtoolize}
-%{__aclocal}
-%{__autoconf}
-%{__autoheader}
-%{__automake}
-%configure \
- --disable-silent-rules
-%{__make}
+%meson build
+
+%meson_build -C build
%install
rm -rf $RPM_BUILD_ROOT
-%{__make} install \
- DESTDIR=$RPM_BUILD_ROOT
+%meson_install -C build
%find_lang %{name}
@@ -108,7 +100,7 @@ rm -rf $RPM_BUILD_ROOT
%files -f %{name}.lang
%defattr(644,root,root,755)
-%doc AUTHORS ChangeLog NEWS README
+%doc AUTHORS ChangeLog NEWS README.md
%attr(755,root,root) %{_bindir}/gssdp-discover
%attr(755,root,root) %{_bindir}/gupnp-av-cp
%attr(755,root,root) %{_bindir}/gupnp-network-light
@@ -118,3 +110,6 @@ rm -rf $RPM_BUILD_ROOT
%{_desktopdir}/gupnp-av-cp.desktop
%{_desktopdir}/gupnp-network-light.desktop
%{_desktopdir}/gupnp-universal-cp.desktop
+%{_iconsdir}/hicolor/256x256/av-cp.png
+%{_iconsdir}/hicolor/256x256/network-light-256x256.png
+%{_iconsdir}/hicolor/256x256/universal-cp.png
diff --git a/gupnp-tools-desktop.patch b/gupnp-tools-desktop.patch
index 8ebd198..4850480 100644
--- a/gupnp-tools-desktop.patch
+++ b/gupnp-tools-desktop.patch
@@ -1,33 +1,33 @@
---- gupnp-tools-0.8.12/data/gupnp-av-cp.desktop.in.in.orig 2016-05-11
22:13:19.590079996 +0200
-+++ gupnp-tools-0.8.12/data/gupnp-av-cp.desktop.in.in 2016-05-11
22:15:54.713406820 +0200
-@@ -1,7 +1,7 @@
- [Desktop Entry]
+--- gupnp-tools-0.8.15/data/gupnp-av-cp.desktop.in.orig 2018-12-10
17:34:41.475536944 +0100
++++ gupnp-tools-0.8.15/data/gupnp-av-cp.desktop.in 2018-12-10
17:36:25.845535752 +0100
+@@ -2,7 +2,7 @@
Encoding=UTF-8
Name=UPnP AV Control Point
+ Comment=Browse and control UPnP multimedia devices
-Categories=GTK;Development;
+Categories=GTK;Network;RemoteAccess;
Exec=gupnp-av-cp
- Icon=@PKGDATADIR@/pixmaps/av-cp.png
- Terminal=false
---- gupnp-tools-0.8.12/data/gupnp-network-light.desktop.in.in.orig
2016-05-11 22:13:19.590079996 +0200
-+++ gupnp-tools-0.8.12/data/gupnp-network-light.desktop.in.in 2016-05-11
22:16:42.286738157 +0200
-@@ -1,7 +1,7 @@
- [Desktop Entry]
+ # Translators: Do NOT translate or transliterate this text (this is an icon
file name)!
+ Icon=av-cp
+--- gupnp-tools-0.8.15/data/gupnp-network-light.desktop.in.orig
2018-12-10 17:34:41.475536944 +0100
++++ gupnp-tools-0.8.15/data/gupnp-network-light.desktop.in 2018-12-10
17:36:36.782202295 +0100
+@@ -2,7 +2,7 @@
Encoding=UTF-8
Name=UPnP Network Light
+ Comment=Sample UPnP application for controlling lights
-Categories=GTK;Development;
+Categories=GTK;Network;RemoteAccess;
Exec=gupnp-network-light
- Icon=@PKGDATADIR@/pixmaps/network-light-256x256.png
- Terminal=false
---- gupnp-tools-0.8.12/data/gupnp-universal-cp.desktop.in.in.orig
2016-05-11 22:13:19.590079996 +0200
-+++ gupnp-tools-0.8.12/data/gupnp-universal-cp.desktop.in.in 2016-05-11
22:17:11.430070272 +0200
-@@ -1,7 +1,7 @@
- [Desktop Entry]
+ # Translators: Do NOT translate or transliterate this text (this is an icon
file name)!
+ Icon=network-light-256x256
+--- gupnp-tools-0.8.15/data/gupnp-universal-cp.desktop.in.orig 2018-12-10
17:34:41.475536944 +0100
++++ gupnp-tools-0.8.15/data/gupnp-universal-cp.desktop.in 2018-12-10
17:36:47.982202167 +0100
+@@ -2,7 +2,7 @@
Encoding=UTF-8
Name=UPnP Universal Control Point
+ Comment=Inspect and control UPnP devices across your local network
-Categories=GTK;Development;
+Categories=GTK;Network;RemoteAccess;
Exec=gupnp-universal-cp
- Icon=@PKGDATADIR@/pixmaps/universal-cp.png
- Terminal=false
+ # Translators: Do NOT translate or transliterate this text (this is an icon
file name)!
+ Icon=universal-cp
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/gupnp-tools.git/commitdiff/6eb323ccbe0c22614b359a6ce7ed31872b3eec6e
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
