From afb707c0ab45405cc3b64a1531353f0dc4ab2649 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Jul 05 2018 17:06:37 +0000 Subject: update to version 2.1.2 --- diff --git a/.gitignore b/.gitignore index 89b8e36..7815a85 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /wingpanel-indicator-power-2.0.1.tar.xz /wingpanel-indicator-power-2.1.0.tar.gz /wingpanel-indicator-power-2.1.1.tar.gz +/wingpanel-indicator-power-2.1.2.tar.gz diff --git a/00-fix-linker-flags.patch b/00-fix-linker-flags.patch deleted file mode 100644 index 8673c5c..0000000 --- a/00-fix-linker-flags.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 84e1899..3abc74c 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -45,7 +45,7 @@ OPTIONS - ) - - add_library (${CMAKE_PROJECT_NAME} MODULE ${VALA_C}) --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 9a0573e..a1d8d75 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wingpanel-indicator-power-2.1.1.tar.gz) = 22ba32466a6f9d15860ff2e42f553aef0b6ecc1aeaa61bb644c5736c28bf2ef1d5d0f9dc37141c5c33b4926685b9690cd7eadc091c0c4dd94227570448ff1cdc +SHA512 (wingpanel-indicator-power-2.1.2.tar.gz) = 453e08b80000130e24b0124ce2b377c62d8748c609e14a12dade4cc1d1376285906f7342c45b0661f6915d45215b90423d68ad8d33e72552aaedec42d53511b9 diff --git a/wingpanel-indicator-power.spec b/wingpanel-indicator-power.spec index 5b4ad6a..ea820ff 100644 --- a/wingpanel-indicator-power.spec +++ b/wingpanel-indicator-power.spec @@ -1,19 +1,18 @@ %global __provides_exclude_from ^%{_libdir}/wingpanel/.*\\.so$ +%global appname io.elementary.desktop.wingpanel.power + Name: wingpanel-indicator-power Summary: Power indicator for wingpanel -Version: 2.1.1 -Release: 8%{?dist} +Version: 2.1.2 +Release: 1%{?dist} License: GPLv2+ 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: pkgconfig(glib-2.0) @@ -37,16 +36,12 @@ A power 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 power-indicator @@ -57,10 +52,13 @@ popd %{_libdir}/wingpanel/libpower.so -%{_datadir}/glib-2.0/schemas/org.pantheon.desktop.wingpanel.indicators.power.gschema.xml +%{_datadir}/glib-2.0/schemas/%{appname}.gschema.xml %changelog +* Thu Jul 05 2018 Fabio Valentini - 2.1.2-1 +- Update to version 2.1.2. + * Wed Jun 13 2018 Fabio Valentini - 2.1.1-8 - Rebuild for granite5 soname bump.