Update to 3.24.1

This commit is contained in:
Kalev Lember 2017-07-31 14:40:18 +01:00
parent d87b24d044
commit f8d303d172
4 changed files with 7 additions and 56 deletions

1
.gitignore vendored
View File

@ -20,3 +20,4 @@ libwnck-2.30.3.tar.bz2
/libwnck-3.20.0.tar.xz
/libwnck-3.20.1.tar.xz
/libwnck-3.24.0.tar.xz
/libwnck-3.24.1.tar.xz

View File

@ -2,16 +2,13 @@
Summary: Window Navigator Construction Kit
Name: libwnck3
Version: 3.24.0
Release: 3%{?dist}
Version: 3.24.1
Release: 1%{?dist}
URL: http://download.gnome.org/sources/%{source_name}/
Source0: http://download.gnome.org/sources/%{source_name}/3.24/%{source_name}-%{version}.tar.xz
License: LGPLv2+
Group: System Environment/Libraries
# https://git.gnome.org/browse/libwnck/commit/?id=4feb967
Patch1: libwnck3_fix-locale-dir.patch
BuildRequires: glib2-devel
BuildRequires: gtk3-devel
BuildRequires: pango-devel
@ -43,10 +40,6 @@ developing applications that use %{name}.
%prep
%setup -q -n %{source_name}-%{version}
%patch1 -p1 -b .fix-locale-dir
autoreconf -fi
%build
%configure \
--disable-static \
@ -85,6 +78,9 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';'
%changelog
* Mon Jul 31 2017 Kalev Lember <klember@redhat.com> - 3.24.1-1
- Update to 3.24.1
* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.24.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild

View File

@ -1,46 +0,0 @@
From aab7f7ace8838803f984599f0cba400d15059be3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alberts=20Muktup=C4=81vels?= <alberts.muktupavels@gmail.com>
Date: Sat, 22 Jul 2017 14:07:04 +0300
Subject: fix locale dir
Commit 4feb96726f014270a6ae4f9ed29342ad53462d7f ported libwnck to
upstream gettext, but was still using $DATADIRNAME that was no
longer substituded with correct directory.
---
configure.ac | 5 -----
libwnck/Makefile.am | 2 +-
2 files changed, 1 insertion(+), 6 deletions(-)
diff --git a/configure.ac b/configure.ac
index 5935844..87e252a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -75,11 +75,6 @@ GETTEXT_PACKAGE=libwnck-3.0
AC_SUBST(GETTEXT_PACKAGE)
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Package name])
-# AM_GLIB_GNU_GETTEXT above substs $DATADIRNAME
-# this is the directory where the *.{mo,gmo} files are installed
-wncklocaledir='${prefix}/${DATADIRNAME}/locale'
-AC_SUBST(wncklocaledir)
-
AC_PATH_PROG([GLIB_COMPILE_RESOURCES], [glib-compile-resources])
AC_PATH_PROG(PKG_CONFIG, pkg-config)
diff --git a/libwnck/Makefile.am b/libwnck/Makefile.am
index 5c025cc..6b6c7f8 100644
--- a/libwnck/Makefile.am
+++ b/libwnck/Makefile.am
@@ -25,7 +25,7 @@ AM_CPPFLAGS = \
-I$(top_srcdir) \
-I$(top_builddir) \
-DWNCK_I_KNOW_THIS_IS_UNSTABLE \
- -DWNCK_LOCALEDIR=\"$(wncklocaledir)\" \
+ -DWNCK_LOCALEDIR=\"$(localedir)\" \
$(DISABLE_DEPRECATED_CFLAGS)
AM_CFLAGS = $(WARN_CFLAGS)
--
cgit v0.12

View File

@ -1 +1 @@
SHA512 (libwnck-3.24.0.tar.xz) = 8b89dde4682d140ad39eb31d52de3549cbfee79ddd92d8bc32632aa785932a3300bbcd2f68325df42eac8bdcbaaf01c274e4894c0661fe493543cff6db7a95d1
SHA512 (libwnck-3.24.1.tar.xz) = e8a31ab2dc0c282f1e0994ce6a2ccd18678dc5c140943399262e795052b7f5da2d6a5d388a74f4b10f8fac66ab138983a9caaee4e72c92a17c01ca5c39b731e1