diff --git a/.gitignore b/.gitignore index ea86b75..891004e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,9 @@ +/results* +/*.src.rpm /wingpanel-indicator-sound-2.0.3.tar.xz /wingpanel-indicator-sound-2.0.4.tar.gz /wingpanel-indicator-sound-2.0.5.tar.gz +/wingpanel-indicator-sound-2.1.0.tar.gz +/wingpanel-indicator-sound-2.1.1.tar.gz +/wingpanel-indicator-sound-2.1.2.tar.gz +/wingpanel-indicator-sound-2.1.3.tar.gz diff --git a/00-fix-linker-flags.patch b/00-fix-linker-flags.patch deleted file mode 100644 index cdd7d2d..0000000 --- a/00-fix-linker-flags.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 6844958..cf5b548 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -43,7 +43,7 @@ include (GResource) - glib_compile_resources (GLIB_RESOURCES_MASK ../data/mask.gresource.xml) - - add_library (${CMAKE_PROJECT_NAME} MODULE ${VALA_C} ${GLIB_RESOURCES_MASK}) --target_link_libraries(${CMAKE_PROJECT_NAME} ${DEPS_LIBRARIES}) -+target_link_libraries(${CMAKE_PROJECT_NAME} ${DEPS_LIBRARIES} m) - - # Installation - install (TARGETS ${CMAKE_PROJECT_NAME} DESTINATION ${PKGDATADIR}) diff --git a/sources b/sources index d584d83..915c1c9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wingpanel-indicator-sound-2.0.5.tar.gz) = 5661897e48be39173f1dc7c59a65e88ae7e65979550c2121f01cbd6b94ff3f72dadc1728ae0b3b1e5bc3837593b3ab889f29febe243178dc940667e430dfd903 +SHA512 (wingpanel-indicator-sound-2.1.3.tar.gz) = e1738238db54c5fb134af7d340c986e19b799862e77c88d74a68d12c26697e4cb18fce92ce55d818ca2e28b3c1a413be787c98c1b62f787d928f331d3d73a0b5 diff --git a/wingpanel-indicator-sound.rpmlintrc b/wingpanel-indicator-sound.rpmlintrc new file mode 100644 index 0000000..fbcdc48 --- /dev/null +++ b/wingpanel-indicator-sound.rpmlintrc @@ -0,0 +1,3 @@ +# false positives +addFilter("E: invalid-lc-messages-dir /usr/share/locale/bh*") +addFilter("E: invalid-lc-messages-dir /usr/share/locale/mo*") diff --git a/wingpanel-indicator-sound.spec b/wingpanel-indicator-sound.spec index c2ddc0d..a61feed 100644 --- a/wingpanel-indicator-sound.spec +++ b/wingpanel-indicator-sound.spec @@ -1,21 +1,19 @@ %global __provides_exclude_from ^%{_libdir}/wingpanel/.*\\.so$ +%global appname io.elementary.desktop.wingpanel.sound + Name: wingpanel-indicator-sound Summary: Sound Indicator for wingpanel -Version: 2.0.5 -Release: 6%{?dist} +Version: 2.1.3 +Release: 1%{?dist} License: GPLv3 URL: https://github.com/elementary/%{name} Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz -# Patch to fix undefined symbols -Patch0: 00-fix-linker-flags.patch - -BuildRequires: cmake BuildRequires: gettext +BuildRequires: meson BuildRequires: vala >= 0.22.0 -BuildRequires: vala-tools BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(granite) @@ -25,8 +23,9 @@ BuildRequires: pkgconfig(libcanberra-gtk) BuildRequires: pkgconfig(libnotify) BuildRequires: pkgconfig(libpulse) BuildRequires: pkgconfig(libpulse-mainloop-glib) -BuildRequires: pkgconfig(wingpanel-2.0) +BuildRequires: pkgconfig(wingpanel-2.0) >= 2.1.0 +Requires: wingpanel%{?_isa} Supplements: wingpanel%{?_isa} @@ -39,16 +38,12 @@ A sound indicator for wingpanel. %build -mkdir build && pushd build -%cmake .. -%make_build -popd +%meson +%meson_build %install -pushd build -%make_install -popd +%meson_install %find_lang sound-indicator @@ -59,10 +54,22 @@ popd %{_libdir}/wingpanel/libsound.so -%{_datadir}/glib-2.0/schemas/org.pantheon.desktop.wingpanel.indicators.sound.gschema.xml +%{_datadir}/glib-2.0/schemas/%{appname}.gschema.xml %changelog +* Thu Mar 07 2019 Fabio Valentini - 2.1.3-1 +- Update to version 2.1.3. + +* Wed Dec 19 2018 Fabio Valentini - 2.1.2-1 +- Update to version 2.1.2. + +* Mon Oct 01 2018 Fabio Valentini - 2.1.1-1 +- Update to version 2.1.1. + +* Thu Jul 05 2018 Fabio Valentini - 2.1.0-1 +- Update to version 2.1.0. + * Fri Feb 09 2018 Fedora Release Engineering - 2.0.5-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild