!7 remove python2 subpackage
From: @caodongxia Reviewed-by: @small_leek Signed-off-by: @small_leek
This commit is contained in:
commit
c200fe5782
@ -1,6 +1,6 @@
|
|||||||
Name: libappindicator
|
Name: libappindicator
|
||||||
Version: 12.10.0
|
Version: 12.10.0
|
||||||
Release: 25
|
Release: 26
|
||||||
Summary: The library of application indicators
|
Summary: The library of application indicators
|
||||||
License: LGPLv2 and LGPLv3
|
License: LGPLv2 and LGPLv3
|
||||||
URL: https://launchpad.net/libappindicator
|
URL: https://launchpad.net/libappindicator
|
||||||
@ -8,23 +8,16 @@ Source0: https://launchpad.net/libappindicator/12.10/12.10.0/+download/libappind
|
|||||||
Patch0001: 0001_Fix_mono_dir.patch
|
Patch0001: 0001_Fix_mono_dir.patch
|
||||||
Patch0002: incompatible_pointer_build_fix.patch
|
Patch0002: incompatible_pointer_build_fix.patch
|
||||||
Patch0003: libappindicator-add-patch-to-modify-build-err.patch
|
Patch0003: libappindicator-add-patch-to-modify-build-err.patch
|
||||||
|
Patch0004: nopython.patch
|
||||||
BuildRequires: autoconf automake gtk-doc vala-tools dbus-glib-devel libdbusmenu-devel
|
BuildRequires: autoconf automake gtk-doc vala-tools dbus-glib-devel libdbusmenu-devel
|
||||||
BuildRequires: libdbusmenu-gtk2-devel libdbusmenu-gtk3-devel gobject-introspection-devel
|
BuildRequires: libdbusmenu-gtk2-devel libdbusmenu-gtk3-devel gobject-introspection-devel
|
||||||
BuildRequires: gtk2-devel gtk3-devel libindicator-devel libindicator-gtk3-devel
|
BuildRequires: gtk2-devel gtk3-devel libindicator-devel libindicator-gtk3-devel
|
||||||
BuildRequires: python2-devel pygtk2-devel
|
|
||||||
|
|
||||||
%description
|
%description
|
||||||
The libappindicator allows applications to export a menu into the Unity Menu bar.
|
The libappindicator allows applications to export a menu into the Unity Menu bar.
|
||||||
It bases on KSNI and works in KDE and will fallback to generic Systray support if
|
It bases on KSNI and works in KDE and will fallback to generic Systray support if
|
||||||
none of those are available.
|
none of those are available.
|
||||||
|
|
||||||
%package -n python2-appindicator
|
|
||||||
%{?python_provide:%python_provide python2-appindicator}
|
|
||||||
Summary: Python 2 bindings for libappindicator
|
|
||||||
Requires: %{name} = %{version}-%{release}
|
|
||||||
%description -n python2-appindicator
|
|
||||||
This package contains the Python 2 bindings for the appindicator library.
|
|
||||||
|
|
||||||
%package devel
|
%package devel
|
||||||
Summary: Development package for libappindicator
|
Summary: Development package for libappindicator
|
||||||
Requires: %{name} = %{version}-%{release}
|
Requires: %{name} = %{version}-%{release}
|
||||||
@ -98,14 +91,6 @@ find %{buildroot} -type f -name '*.la' -delete
|
|||||||
%doc AUTHORS README COPYING COPYING.LGPL.2.1
|
%doc AUTHORS README COPYING COPYING.LGPL.2.1
|
||||||
%{_libdir}/libappindicator.so.*
|
%{_libdir}/libappindicator.so.*
|
||||||
%{_libdir}/girepository-1.0/AppIndicator-0.1.typelib
|
%{_libdir}/girepository-1.0/AppIndicator-0.1.typelib
|
||||||
%files -n python2-appindicator
|
|
||||||
%dir %{python_sitearch}/appindicator/
|
|
||||||
%{python_sitearch}/appindicator/__init__.py*
|
|
||||||
%{python_sitearch}/appindicator/_appindicator.so
|
|
||||||
%dir %{_datadir}/pygtk/
|
|
||||||
%dir %{_datadir}/pygtk/2.0/
|
|
||||||
%dir %{_datadir}/pygtk/2.0/defs/
|
|
||||||
%{_datadir}/pygtk/2.0/defs/appindicator.defs
|
|
||||||
%files devel
|
%files devel
|
||||||
%dir %{_includedir}/libappindicator-0.1/
|
%dir %{_includedir}/libappindicator-0.1/
|
||||||
%dir %{_includedir}/libappindicator-0.1/libappindicator/
|
%dir %{_includedir}/libappindicator-0.1/libappindicator/
|
||||||
@ -132,6 +117,9 @@ find %{buildroot} -type f -name '*.la' -delete
|
|||||||
%doc %{_datadir}/gtk-doc/html/libappindicator/
|
%doc %{_datadir}/gtk-doc/html/libappindicator/
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Oct 21 2020 chengzihan <chengzihan2@huawei.com> - 12.10.0-26
|
||||||
|
- Remove Subpackage python2-appindicator
|
||||||
|
|
||||||
* Fri Feb 07 2020 yanzhihua <yanzhihua4@huawei.com> - 12.10.0-25
|
* Fri Feb 07 2020 yanzhihua <yanzhihua4@huawei.com> - 12.10.0-25
|
||||||
- Type:enhancement
|
- Type:enhancement
|
||||||
- Id:NA
|
- Id:NA
|
||||||
|
|||||||
59
nopython.patch
Normal file
59
nopython.patch
Normal file
@ -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
|
||||||
Loading…
x
Reference in New Issue
Block a user