Compare commits

..

No commits in common. 'i10ce' and 'epel9' have entirely different histories.
i10ce ... epel9

2
.gitignore vendored

@ -1 +1 @@
SOURCES/libappindicator_12.10.1+20.10.20200706.1.orig.tar.gz
/libappindicator-12.10.0.tar.gz

@ -1 +0,0 @@
8709a62b688e542ac27df766e7230d0b0d9588d4 SOURCES/libappindicator_12.10.1+20.10.20200706.1.orig.tar.gz

@ -5,7 +5,7 @@ diff -Nru libappindicator-0.4.92.orig/bindings/mono/appindicator-sharp-0.1.pc.in
prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
-assemblies_dir=${prefix}/lib/cli/appindicator-sharp-0.1
-assemblies_dir=${libdir}/cli/appindicator-sharp-0.1
+assemblies_dir=${libdir}/appindicator-sharp-0.1
Name: appindicator-sharp

@ -0,0 +1,12 @@
diff -up libappindicator-12.10.0/src/app-indicator.c.build_fix libappindicator-12.10.0/src/app-indicator.c
--- libappindicator-12.10.0/src/app-indicator.c.build_fix 2018-04-10 14:43:57.134400594 +0200
+++ libappindicator-12.10.0/src/app-indicator.c 2018-04-10 14:45:34.655448722 +0200
@@ -2196,7 +2196,7 @@ app_indicator_set_secondary_activate_tar
g_return_if_fail (GTK_IS_WIDGET (menuitem));
- priv->sec_activate_target = g_object_ref(G_OBJECT(menuitem));
+ priv->sec_activate_target = g_object_ref(menuitem);
priv->sec_activate_enabled = widget_is_menu_child(self, menuitem);
g_signal_connect(menuitem, "parent-set", G_CALLBACK(sec_activate_target_parent_changed), self);
}

@ -1,9 +1,3 @@
%if 0%{?rhel} >= 10
%bcond_with gtk2
%else
%bcond_without gtk2
%endif
%if 0%{?rhel} >= 9
%bcond_with mono
%else
@ -11,16 +5,17 @@
%endif
Name: libappindicator
Version: 12.10.1
Release: 7%{?dist}
Version: 12.10.0
Release: 33%{?dist}
Summary: Application indicators library
# Automatically converted from old format: LGPLv2 and LGPLv3 - review is highly recommended.
License: LicenseRef-Callaway-LGPLv2 AND LGPL-3.0-only
License: LGPLv2 and LGPLv3
URL: https://launchpad.net/libappindicator
# see https://launchpad.net/ubuntu/+source/libappindicator/12.10.1+20.10.20200706.1-0ubuntu1
Source0: https://launchpad.net/ubuntu/+archive/primary/+sourcefiles/%{name}/%{version}+20.10.20200706.1-0ubuntu1/%{name}_%{version}+20.10.20200706.1.orig.tar.gz
Source0: https://launchpad.net/libappindicator/12.10/%{version}/+download/%{name}-%{version}.tar.gz
Patch0: 0001_Fix_mono_dir.patch
# https://bazaar.launchpad.net/~indicator-applet-developers/libappindicator/trunk.16.10/revision/285
Patch1: incompatible_pointer_build_fix.patch
Patch2: nopython.patch
BuildRequires: make
BuildRequires: autoconf
@ -29,12 +24,10 @@ BuildRequires: gtk-doc
BuildRequires: vala
BuildRequires: dbus-glib-devel
BuildRequires: libdbusmenu-devel
%if %{with gtk2}
BuildRequires: libdbusmenu-gtk2-devel
BuildRequires: gtk2-devel
%endif
BuildRequires: libdbusmenu-gtk3-devel
BuildRequires: gobject-introspection-devel
BuildRequires: gtk2-devel
BuildRequires: gtk3-devel
BuildRequires: libindicator-devel
BuildRequires: libindicator-gtk3-devel
@ -53,7 +46,6 @@ on KSNI it also works in KDE and will fallback to generic Systray support if
none of those are available.
%if %{with gtk2}
%package devel
Summary: Development files for %{name}
@ -63,7 +55,6 @@ Requires: libdbusmenu-devel
%description devel
This package contains the development files for the appindicator library.
%endif
%package gtk3
@ -125,11 +116,13 @@ This package contains the development files for the appindicator-sharp library.
%prep
%setup -q -c
%patch -P0 -p1 -b .monodir
%setup -q
%patch0 -p1 -b .monodir
%patch1 -p1 -b .incompatible_pointer_build_fix
%patch2 -p1 -b .nopython
sed -i "s#mono-csc#mcs#g" configure.ac
sed -i "s#gmcs#mcs#g" configure.ac
# fix for gtk-doc 1.26
sed -i 's/--nogtkinit//' docs/reference/Makefile.am
gtkdocize --copy
@ -141,14 +134,12 @@ autoreconf -vif
%global _configure ../configure
mkdir build-gtk2 build-gtk3
%if %{with gtk2}
pushd build-gtk2
export CFLAGS="%{optflags} $CFLAGS -Wno-deprecated-declarations -Wno-error"
%configure --with-gtk=2 --enable-gtk-doc --disable-static
# Parallel make, crash the build
make -j1 V=1
popd
%endif
pushd build-gtk3
export CFLAGS="%{optflags} $CFLAGS -Wno-deprecated-declarations"
@ -159,11 +150,9 @@ popd
%install
%if %{with gtk2}
pushd build-gtk2
make install DESTDIR=%{buildroot}
popd
%endif
pushd build-gtk3
make install DESTDIR=%{buildroot}
@ -172,16 +161,14 @@ popd
find %{buildroot} -type f -name '*.la' -delete
%if %{with gtk2}
%ldconfig_scriptlets
%endif
%ldconfig_scriptlets gtk3
%if %{with gtk2}
%files
%doc AUTHORS README COPYING COPYING.LGPL.2.1
%{_libdir}/libappindicator.so.*
%{_libdir}/girepository-1.0/AppIndicator-0.1.typelib
%files devel
@ -190,7 +177,9 @@ find %{buildroot} -type f -name '*.la' -delete
%{_includedir}/libappindicator-0.1/libappindicator/*.h
%{_libdir}/libappindicator.so
%{_libdir}/pkgconfig/appindicator-0.1.pc
%endif
%{_datadir}/gir-1.0/AppIndicator-0.1.gir
%{_datadir}/vala/vapi/appindicator-0.1.vapi
%{_datadir}/vala/vapi/appindicator-0.1.deps
%files gtk3
@ -245,36 +234,6 @@ find %{buildroot} -type f -name '*.la' -delete
%endif
%changelog
* Mon Dec 23 2024 Arkady L. Shane <tigro@msvsphere-os.ru> - 12.10.1-7
- Rebuilt for MSVSphere 10
* Tue Nov 05 2024 Michel Lind <salimma@fedoraproject.org> - 12.10.1-7
- Drop gtk2 support on EL >= 10
* Mon Sep 02 2024 Miroslav Suchý <msuchy@redhat.com> - 12.10.1-6
- convert license to SPDX
* Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 12.10.1-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 12.10.1-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 12.10.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 12.10.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 12.10.1-1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Mon Nov 07 2022 Timotheus Pokorra <timotheus.pokorra@solidcharity.com> - 12.10.1-0
- Upgrade to 12.10.1 to fix bug 2135815
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 12.10.0-34
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Sun Jun 26 2022 Neal Gompa <ngompa@fedoraproject.org> - 12.10.0-33
- Disable Mono bindings for RHEL 9+ for now
@ -290,7 +249,7 @@ find %{buildroot} -type f -name '*.la' -delete
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 12.10.0-29
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Sun Apr 12 2020 Eduardo Echeverria <echevemaster@gmail.com> - 12-10-0-28
* Sun Apr 13 2020 Eduardo Echeverria <echevemaster@gmail.com> - 12-10-0-28
- Added mono to sharp sub-package
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 12.10.0-27

@ -0,0 +1,59 @@
diff --git a/bindings/Makefile.am b/bindings/Makefile.am
index d1f6d73..dccca6c 100644
--- a/bindings/Makefile.am
+++ b/bindings/Makefile.am
@@ -3,7 +3,6 @@ SUBDIRS = \
vala
else
SUBDIRS = \
- python \
vala
endif
diff --git a/configure.ac b/configure.ac
index ee03390..4713b22 100644
--- a/configure.ac
+++ b/configure.ac
@@ -181,33 +181,6 @@ AM_CONDITIONAL(BUILD_MONO_TEST, test x${have_nunit} = xyes)
with_localinstall="no"
AC_ARG_ENABLE(localinstall, AS_HELP_STRING([--enable-localinstall], [install all of the files localy instead of system directories (for distcheck)]), with_localinstall=$enableval, with_localinstall=no)
-###########################
-# Python
-###########################
-
-PYGTK_REQUIRED=2.14.0
-PYGOBJECT_REQUIRED=0.22
-
-AM_PATH_PYTHON(2.3.5)
-AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)])
-
-PKG_CHECK_MODULES(APPINDICATOR_PYTHON,
- [
- pygtk-2.0 >= $PYGTK_REQUIRED
- gtk+-2.0 >= $GTK_REQUIRED_VERSION
- pygobject-2.0 >= $PYGOBJECT_REQUIRED
- ])
-
-AC_MSG_CHECKING(for pygtk defs)
-PYGTK_DEFSDIR=`$PKG_CONFIG --variable=defsdir pygtk-2.0`
-AC_SUBST(PYGTK_DEFSDIR)
-AC_MSG_RESULT($PYGTK_DEFSDIR)
-
-AC_MSG_CHECKING(for pygtk codegen)
-PYGTK_CODEGEN="$PYTHON `$PKG_CONFIG --variable=codegendir pygtk-2.0`/codegen.py"
-AC_SUBST(PYGTK_CODEGEN)
-AC_MSG_RESULT($PYGTK_CODEGEN)
-
#########################
# Check if build tests
#########################
@@ -239,8 +212,6 @@ src/Makefile
src/appindicator-0.1.pc
src/appindicator3-0.1.pc
bindings/Makefile
-bindings/python/Makefile
-bindings/python/appindicator.override
bindings/vala/Makefile
bindings/vala/examples/Makefile
tests/Makefile

@ -0,0 +1 @@
41910f2005edee9240da1e53fffcdc12 libappindicator-12.10.0.tar.gz
Loading…
Cancel
Save