Compare commits

..

No commits in common. "1b18ee119cb691e8fefd92660ff8b8ce20328f24" and "7b59a68335569a75155fbca585d198fb111768b2" have entirely different histories.

2 changed files with 51 additions and 54 deletions

View File

@ -1,12 +0,0 @@
diff -aurN libappindicator-12.10.0/src/Makefile.am libappindicator-12.10.0-mod/src/Makefile.am
--- libappindicator-12.10.0/src/Makefile.am 2012-07-11 19:28:34.415113869 +0200
+++ libappindicator-12.10.0-mod/src/Makefile.am 2019-12-24 13:38:57.015051155 +0100
@@ -76,7 +76,7 @@
libappindicator_la_CFLAGS = \
$(LIBRARY_CFLAGS) \
$(COVERAGE_CFLAGS) \
- -Wall -Werror \
+ -Wall -Wno-deprecated-declarations \
-DG_LOG_DOMAIN=\"libappindicator\"
libappindicator_la_LIBADD = \

View File

@ -1,17 +1,20 @@
Name: libappindicator
Version: 12.10.0
Release: 25
Release: 21
Summary: The library of application indicators
License: LGPLv2 and LGPLv3
URL: https://launchpad.net/libappindicator
Source0: https://launchpad.net/libappindicator/12.10/12.10.0/+download/libappindicator-12.10.0.tar.gz
Patch0001: 0001_Fix_mono_dir.patch
Patch0002: incompatible_pointer_build_fix.patch
Patch0003: libappindicator-add-patch-to-modify-build-err.patch
BuildRequires: autoconf automake gtk-doc vala-tools dbus-glib-devel libdbusmenu-devel
BuildRequires: libdbusmenu-gtk2-devel libdbusmenu-gtk3-devel gobject-introspection-devel
BuildRequires: gtk2-devel gtk3-devel libindicator-devel libindicator-gtk3-devel
BuildRequires: python2-devel pygtk2-devel
%ifarch %{mono_arches}
BuildRequires: gtk-sharp2-devel gtk-sharp2-gapi mono-devel mono-nunit-devel
%endif
%description
The libappindicator allows applications to export a menu into the Unity Menu bar.
@ -21,13 +24,13 @@ 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}
Requires: libappindicator = 12.10.0-21
%description -n python2-appindicator
This package contains the Python 2 bindings for the appindicator library.
%package devel
Summary: Development package for libappindicator
Requires: %{name} = %{version}-%{release}
Requires: libappindicator = 12.10.0-21
Requires: dbus-glib-devel libdbusmenu-devel
%description devel
This package contains the development files for the appindicator library.
@ -39,7 +42,7 @@ This package contains the GTK 3 version of libappindicator.
%package gtk3-devel
Summary: Development package for libappindicator-gtk3
Requires: %{name}-gtk3 = %{version}-%{release}
Requires: libappindicator-gtk3 = 12.10.0-21
Requires: dbus-glib-devel libdbusmenu-devel
%description gtk3-devel
This package contains the development files for the appindicator-gtk3 library.
@ -51,8 +54,23 @@ BuildArch: noarch
This package contains the documentation for the appindicator and
appindicator-gtk3 libraries.
%ifarch %{mono_arches}
%package sharp
Summary: Application indicators library - C#
%description sharp
This package contains the Mono C# bindings for this library.
%package sharp-devel
Summary: Development package for libappindicator-sharp
Requires: libappindicator-sharp = 12.10.0-21
%description sharp-devel
This package contains the development files for the appindicator-sharp library.
%endif
%prep
%autosetup -p1
%setup -q
%patch0001 -p1 -b .monodir
%patch0002 -p1 -b .incompatible_pointer_build_fix
sed -i "s#gmcs#mcs#g" configure.ac
sed -i 's/--nogtkinit//' docs/reference/Makefile.am
gtkdocize --copy
@ -81,18 +99,8 @@ pushd build-gtk3
make install DESTDIR=%{buildroot}
popd
find %{buildroot} -type f -name '*.la' -delete
%post
/sbin/ldconfig
%postun
/sbin/ldconfig
%post gtk3
/sbin/ldconfig
%postun gtk3
/sbin/ldconfig
%ldconfig_scriptlets
%ldconfig_scriptlets gtk3
%files
%doc AUTHORS README COPYING COPYING.LGPL.2.1
@ -131,30 +139,31 @@ find %{buildroot} -type f -name '*.la' -delete
%files docs
%doc %{_datadir}/gtk-doc/html/libappindicator/
%ifarch %{mono_arches}
%files sharp
%doc AUTHORS README COPYING COPYING.LGPL.2.1
%dir %{_libdir}/appindicator-sharp-0.1/
%{_libdir}/appindicator-sharp-0.1/appindicator-sharp.dll
%{_libdir}/appindicator-sharp-0.1/appindicator-sharp.dll.config
%{_libdir}/appindicator-sharp-0.1/policy.0.0.appindicator-sharp.config
%{_libdir}/appindicator-sharp-0.1/policy.0.0.appindicator-sharp.dll
%{_libdir}/appindicator-sharp-0.1/policy.0.1.appindicator-sharp.config
%{_libdir}/appindicator-sharp-0.1/policy.0.1.appindicator-sharp.dll
%dir %{_prefix}/lib/mono/appindicator-sharp/
%{_prefix}/lib/mono/appindicator-sharp/appindicator-sharp.dll
%{_prefix}/lib/mono/appindicator-sharp/policy.0.0.appindicator-sharp.dll
%dir %{_prefix}/lib/mono/gac/appindicator-sharp/
%dir %{_prefix}/lib/mono/gac/appindicator-sharp/*/
%{_prefix}/lib/mono/gac/appindicator-sharp/*/appindicator-sharp.dll
%{_prefix}/lib/mono/gac/appindicator-sharp/*/appindicator-sharp.dll.config
%dir %{_prefix}/lib/mono/gac/policy.0.0.appindicator-sharp/
%dir %{_prefix}/lib/mono/gac/policy.0.0.appindicator-sharp/*/
%{_prefix}/lib/mono/gac/policy.0.0.appindicator-sharp/*/policy.0.0.appindicator-sharp.dll
%{_prefix}/lib/mono/gac/policy.0.0.appindicator-sharp/*/policy.0.0.appindicator-sharp.config
%files sharp-devel
%{_libdir}/pkgconfig/appindicator-sharp-0.1.pc
%endif
%changelog
* Fri Feb 07 2020 yanzhihua <yanzhihua4@huawei.com> - 12.10.0-25
- Type:enhancement
- Id:NA
- SUG:NA
- DESC:ldconfig_scriptlets does not exist so modify the use of ldconfig, and rename the patch
* Wed Jan 15 2020 openEuler Buildteam <buildteam@openeuler.org> - 12.10.0-24
- Type:enhancement
- Id:NA
- SUG:NA
- DESC:optimization the spec
* Wed Jan 15 2020 openEuler Buildteam <buildteam@openeuler.org> - 12.10.0-23
- Type:enhancement
- Id:NA
- SUG:NA
- DESC:optimization the spec
* Wed Jan 15 2020 openEuler Buildteam <buildteam@openeuler.org> - 12.10.0-22
- Type:enhancement
- Id:NA
- SUG:NA
- DESC:optimization the spec
* Tue Nov 26 2019 openEuler Buildteam <buildteam@openeuler.org> - 12.10.0-21
- Package init