From 9dd9529494fcf9713aa1d2dd2a909c251fcf0d92 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 9 Dec 2010 01:05:03 +0000 Subject: [PATCH 01/46] Initial setup of the repo --- .gitignore | 0 sources | 0 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 .gitignore create mode 100644 sources diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..e69de29 diff --git a/sources b/sources new file mode 100644 index 0000000..e69de29 From bf584ef756e87a6fced11d2ae864d35b065dfd9a Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Wed, 8 Dec 2010 18:23:15 -0800 Subject: [PATCH 02/46] initial package --- .gitignore | 1 + libindicator-0.3.15-abs_srcdir.patch | 22 ++++ libindicator-0.3.15-loader3.patch | 35 +++++++ libindicator.spec | 149 +++++++++++++++++++++++++++ sources | 1 + 5 files changed, 208 insertions(+) create mode 100644 libindicator-0.3.15-abs_srcdir.patch create mode 100644 libindicator-0.3.15-loader3.patch create mode 100644 libindicator.spec diff --git a/.gitignore b/.gitignore index e69de29..bd95902 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1 @@ +/libindicator-0.3.15.tar.gz diff --git a/libindicator-0.3.15-abs_srcdir.patch b/libindicator-0.3.15-abs_srcdir.patch new file mode 100644 index 0000000..7f9f675 --- /dev/null +++ b/libindicator-0.3.15-abs_srcdir.patch @@ -0,0 +1,22 @@ +=== modified file 'libindicator/Makefile.am' +--- libindicator/Makefile.am 2010-11-11 15:38:56 +0000 ++++ libindicator/Makefile.am 2010-11-24 23:00:33 +0000 +@@ -73,7 +73,7 @@ + indicator-object-enum-types.h: s-enum-types-h + @true + s-enum-types-h: $(indicator_headers) +- ( cd $(srcdir) && $(GLIB_MKENUMS) --template $(srcdir)/indicator-object-enum-types.h.template \ ++ ( cd $(srcdir) && $(GLIB_MKENUMS) --template $(abs_srcdir)/indicator-object-enum-types.h.template \ + $(indicator_headers) ) >> tmp-indicator-object-enum-types.h \ + && (cmp -s tmp-indicator-object-enum-types.h indicator-object-enum-types.h || cp tmp-indicator-object-enum-types.h indicator-object-enum-types.h ) \ + && rm -f tmp-indicator-object-enum-types.h && echo timestamp > $(@F) +@@ -81,7 +81,7 @@ + indicator-object-enum-types.c: s-enum-types-c + @true + s-enum-types-c: $(indicator_headers) +- ( cd $(srcdir) && $(GLIB_MKENUMS) --template $(srcdir)/indicator-object-enum-types.c.template \ ++ ( cd $(srcdir) && $(GLIB_MKENUMS) --template $(abs_srcdir)/indicator-object-enum-types.c.template \ + $(indicator_headers) ) > tmp-indicator-object-enum-types.c \ + && (cmp -s tmp-indicator-object-enum-types.c indicator-object-enum-types.c || cp tmp-indicator-object-enum-types.c indicator-object-enum-types.c ) \ + && rm -f tmp-indicator-object-enum-types.c + diff --git a/libindicator-0.3.15-loader3.patch b/libindicator-0.3.15-loader3.patch new file mode 100644 index 0000000..971fdbf --- /dev/null +++ b/libindicator-0.3.15-loader3.patch @@ -0,0 +1,35 @@ +=== modified file 'tools/Makefile.am' +--- tools/Makefile.am 2010-11-11 15:25:43 +0000 ++++ tools/Makefile.am 2010-11-24 23:00:06 +0000 +@@ -1,11 +1,13 @@ + if USE_GTK3 + INDICATOR_LIB = -lindicator3 ++libexec_PROGRAMS = indicator-loader3 ++VER=3 + else ++VER= + INDICATOR_LIB = -lindicator ++libexec_PROGRAMS = indicator-loader + endif + +-libexec_PROGRAMS = \ +- indicator-loader + + ############################# + # Indicator Loader +@@ -24,6 +26,14 @@ + -L$(top_builddir)/libindicator/.libs \ + $(INDICATOR_LIB) + ++# We duplicate these here because Automake won't let us use $(VER) on the left hand side. ++# Since we carefully use $(VER) in the right hand side above, we can assign the same values. ++# Only one version of the library is every compiled at the same time, so it is safe to reuse ++# the right hand sides like this. ++indicator_loader3_SOURCES = $(indicator_loader_SOURCES) ++indicator_loader3_CFLAGS = $(indicator_loader_CFLAGS) ++indicator_loader3_LDADD = $(indicator_loader_LDADD) ++ + xsessiondir = $(sysconfdir)/X11/Xsession.d + + xsession_DATA = 80indicator-debugging + diff --git a/libindicator.spec b/libindicator.spec new file mode 100644 index 0000000..0134327 --- /dev/null +++ b/libindicator.spec @@ -0,0 +1,149 @@ +Summary: Shared functions for Ayatana indicators +Name: libindicator +Version: 0.3.15 +Release: 1%{?dist} +License: GPLv3 +Group: System Environment/Libraries +URL: https://launchpad.net/libindicator +Source0: http://launchpad.net/libindicator/0.3/%{version}/+download/%{name}-%{version}.tar.gz +# From upstream https://code.launchpad.net/~ken-vandine/libindicator/natty_fixes +# fix out-of-tree build and rename the GTK+ 3 indicator-loader for +# parallel installation +Patch0: libindicator-0.3.15-abs_srcdir.patch +Patch1: libindicator-0.3.15-loader3.patch + +BuildRequires: gtk-doc +BuildRequires: libtool +BuildRequires: dbus-glib-devel +BuildRequires: gtk2-devel +BuildRequires: gtk3-devel + +%description +A set of symbols and convenience functions that all Ayatana indicators +are likely to use. + +%package tools +Summary: Tools for %{name} +Group: System Environment/Libraries + +%description tools +This package contains tools used by the %{name} package, the +Ayatana indicators system. + +%package devel +Summary: Development files for %{name} +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} +Requires: pkgconfig + +%description devel +The %{name}-devel package contains libraries and header files for +developing applications that use %{name}. + +%package gtk3 +Summary: GTK+3 build of %{name} +Group: System Environment/Libraries + +%description gtk3 +A set of symbols and convenience functions that all Ayatana indicators +are likely to use. This is the GTK+ 3 build of %{name}, for use +by GTK+ 3 apps. + +%package gtk3-tools +Summary: Tools for %{name} +Group: System Environment/Libraries + +%description gtk3-tools +This package contains tools used by the %{name}-gtk3 package, the +Ayatana indicators system. This package contains the builds of the +tools for the GTK+3 build of %{name}. + +%package gtk3-devel +Summary: Development files for %{name}-gtk3 +Group: Development/Libraries +Requires: %{name}-gtk3 = %{version}-%{release} +Requires: pkgconfig + +%description gtk3-devel +The %{name}-gtk3-devel package contains libraries and header files for +developing applications that use %{name}-gtk3. + +%prep +%setup -q +%patch0 -p0 -b .abs_srcdir +%patch1 -p0 -b .loader3 + +%build +# without this, you get rpath problems; can't figure why +autoreconf -i + +# we build it twice, once against GTK+ 3 and once against GTK+ 2, so +# both GTK+ 2 and GTK+ 3 apps can use it; the GTK+ 3 build is +# libindicator-gtk3. When we have no need for the GTK+ 2 build any more +# we can drop the -gtk3 package and have the main package build against +# GTK+ 3. +%global _configure ../configure +rm -rf build-gtk3 build-gtk2 +mkdir build-gtk3 build-gtk2 +pushd build-gtk2 +%configure --disable-static +make %{?_smp_mflags} +popd +pushd build-gtk3 +%configure --disable-static --with-gtk=3 +make %{?_smp_mflags} +popd + +%install +rm -rf %{buildroot} +make -C build-gtk2 DESTDIR=%{buildroot} install +make -C build-gtk3 DESTDIR=%{buildroot} install +find %{buildroot} -regex ".*\.la$" | xargs rm -f -- + +# this dummy indicator is fairly useless, it's not shipped in Ubuntu +rm -f %{buildroot}%{_libdir}/libdummy-indicator*.so + +%post -p /sbin/ldconfig +%postun -p /sbin/ldconfig +%post gtk3 -p /sbin/ldconfig +%postun gtk3 -p /sbin/ldconfig + +%files +%defattr(-,root,root,-) +%doc COPYING +%{_libdir}/libindicator.so.* + +%files tools +%defattr(-,root,root,-) +%doc COPYING +%{_libexecdir}/indicator-loader + +%files devel +%defattr(-,root,root,-) +%doc COPYING +%{_includedir}/libindicator-0.3 +%{_libdir}/libindicator.so +%{_libdir}/pkgconfig/indicator.pc +# This is marked as 'for development use only' +%{_sysconfdir}/X11/Xsession.d/80indicator-debugging + +%files gtk3 +%defattr(-,root,root,-) +%doc COPYING +%{_libdir}/libindicator3.so.* + +%files gtk3-tools +%defattr(-,root,root,-) +%doc COPYING +%{_libexecdir}/indicator-loader3 + +%files gtk3-devel +%defattr(-,root,root,-) +%doc COPYING +%{_includedir}/libindicator3-0.3 +%{_libdir}/libindicator3.so +%{_libdir}/pkgconfig/indicator3.pc + +%changelog +* Fri Dec 03 2010 Adam Williamson - 0.3.15-1 +- initial package diff --git a/sources b/sources index e69de29..5c0995b 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +0ae797cbb0fb803c38b8d4da3969d8b1 libindicator-0.3.15.tar.gz From 00aaeb6f806fa3de36d555a922bde59230f35957 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 10 Jan 2011 08:58:27 -0500 Subject: [PATCH 03/46] rebuild --- libindicator.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libindicator.spec b/libindicator.spec index 0134327..ac154e2 100644 --- a/libindicator.spec +++ b/libindicator.spec @@ -1,7 +1,7 @@ Summary: Shared functions for Ayatana indicators Name: libindicator Version: 0.3.15 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv3 Group: System Environment/Libraries URL: https://launchpad.net/libindicator @@ -145,5 +145,8 @@ rm -f %{buildroot}%{_libdir}/libdummy-indicator*.so %{_libdir}/pkgconfig/indicator3.pc %changelog +* Mon Jan 10 2011 Matthias Clasen - 0.3.15-2 +- Rebuild against newer gtk3 + * Fri Dec 03 2010 Adam Williamson - 0.3.15-1 - initial package From 375d5b1efda59e0a753336de5375fcffeba7d7c4 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Sun, 23 Jan 2011 11:24:14 -0800 Subject: [PATCH 04/46] new version 0.3.17, drop the patches --- .gitignore | 1 + libindicator-0.3.15-abs_srcdir.patch | 22 ----------------- libindicator-0.3.15-loader3.patch | 35 ---------------------------- libindicator.spec | 19 ++++++--------- sources | 2 +- 5 files changed, 9 insertions(+), 70 deletions(-) delete mode 100644 libindicator-0.3.15-abs_srcdir.patch delete mode 100644 libindicator-0.3.15-loader3.patch diff --git a/.gitignore b/.gitignore index bd95902..6c05229 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /libindicator-0.3.15.tar.gz +/libindicator-0.3.17.tar.gz diff --git a/libindicator-0.3.15-abs_srcdir.patch b/libindicator-0.3.15-abs_srcdir.patch deleted file mode 100644 index 7f9f675..0000000 --- a/libindicator-0.3.15-abs_srcdir.patch +++ /dev/null @@ -1,22 +0,0 @@ -=== modified file 'libindicator/Makefile.am' ---- libindicator/Makefile.am 2010-11-11 15:38:56 +0000 -+++ libindicator/Makefile.am 2010-11-24 23:00:33 +0000 -@@ -73,7 +73,7 @@ - indicator-object-enum-types.h: s-enum-types-h - @true - s-enum-types-h: $(indicator_headers) -- ( cd $(srcdir) && $(GLIB_MKENUMS) --template $(srcdir)/indicator-object-enum-types.h.template \ -+ ( cd $(srcdir) && $(GLIB_MKENUMS) --template $(abs_srcdir)/indicator-object-enum-types.h.template \ - $(indicator_headers) ) >> tmp-indicator-object-enum-types.h \ - && (cmp -s tmp-indicator-object-enum-types.h indicator-object-enum-types.h || cp tmp-indicator-object-enum-types.h indicator-object-enum-types.h ) \ - && rm -f tmp-indicator-object-enum-types.h && echo timestamp > $(@F) -@@ -81,7 +81,7 @@ - indicator-object-enum-types.c: s-enum-types-c - @true - s-enum-types-c: $(indicator_headers) -- ( cd $(srcdir) && $(GLIB_MKENUMS) --template $(srcdir)/indicator-object-enum-types.c.template \ -+ ( cd $(srcdir) && $(GLIB_MKENUMS) --template $(abs_srcdir)/indicator-object-enum-types.c.template \ - $(indicator_headers) ) > tmp-indicator-object-enum-types.c \ - && (cmp -s tmp-indicator-object-enum-types.c indicator-object-enum-types.c || cp tmp-indicator-object-enum-types.c indicator-object-enum-types.c ) \ - && rm -f tmp-indicator-object-enum-types.c - diff --git a/libindicator-0.3.15-loader3.patch b/libindicator-0.3.15-loader3.patch deleted file mode 100644 index 971fdbf..0000000 --- a/libindicator-0.3.15-loader3.patch +++ /dev/null @@ -1,35 +0,0 @@ -=== modified file 'tools/Makefile.am' ---- tools/Makefile.am 2010-11-11 15:25:43 +0000 -+++ tools/Makefile.am 2010-11-24 23:00:06 +0000 -@@ -1,11 +1,13 @@ - if USE_GTK3 - INDICATOR_LIB = -lindicator3 -+libexec_PROGRAMS = indicator-loader3 -+VER=3 - else -+VER= - INDICATOR_LIB = -lindicator -+libexec_PROGRAMS = indicator-loader - endif - --libexec_PROGRAMS = \ -- indicator-loader - - ############################# - # Indicator Loader -@@ -24,6 +26,14 @@ - -L$(top_builddir)/libindicator/.libs \ - $(INDICATOR_LIB) - -+# We duplicate these here because Automake won't let us use $(VER) on the left hand side. -+# Since we carefully use $(VER) in the right hand side above, we can assign the same values. -+# Only one version of the library is every compiled at the same time, so it is safe to reuse -+# the right hand sides like this. -+indicator_loader3_SOURCES = $(indicator_loader_SOURCES) -+indicator_loader3_CFLAGS = $(indicator_loader_CFLAGS) -+indicator_loader3_LDADD = $(indicator_loader_LDADD) -+ - xsessiondir = $(sysconfdir)/X11/Xsession.d - - xsession_DATA = 80indicator-debugging - diff --git a/libindicator.spec b/libindicator.spec index ac154e2..74daf14 100644 --- a/libindicator.spec +++ b/libindicator.spec @@ -1,16 +1,11 @@ Summary: Shared functions for Ayatana indicators Name: libindicator -Version: 0.3.15 -Release: 2%{?dist} +Version: 0.3.17 +Release: 1%{?dist} License: GPLv3 Group: System Environment/Libraries URL: https://launchpad.net/libindicator Source0: http://launchpad.net/libindicator/0.3/%{version}/+download/%{name}-%{version}.tar.gz -# From upstream https://code.launchpad.net/~ken-vandine/libindicator/natty_fixes -# fix out-of-tree build and rename the GTK+ 3 indicator-loader for -# parallel installation -Patch0: libindicator-0.3.15-abs_srcdir.patch -Patch1: libindicator-0.3.15-loader3.patch BuildRequires: gtk-doc BuildRequires: libtool @@ -70,13 +65,8 @@ developing applications that use %{name}-gtk3. %prep %setup -q -%patch0 -p0 -b .abs_srcdir -%patch1 -p0 -b .loader3 %build -# without this, you get rpath problems; can't figure why -autoreconf -i - # we build it twice, once against GTK+ 3 and once against GTK+ 2, so # both GTK+ 2 and GTK+ 3 apps can use it; the GTK+ 3 build is # libindicator-gtk3. When we have no need for the GTK+ 2 build any more @@ -145,6 +135,11 @@ rm -f %{buildroot}%{_libdir}/libdummy-indicator*.so %{_libdir}/pkgconfig/indicator3.pc %changelog +* Sun Jan 23 2011 Adam Williamson - 0.3.17-1 +- new version 0.3.17 +- drop both patches (upstream) +- no need for autoreconf any more + * Mon Jan 10 2011 Matthias Clasen - 0.3.15-2 - Rebuild against newer gtk3 diff --git a/sources b/sources index 5c0995b..9dea491 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0ae797cbb0fb803c38b8d4da3969d8b1 libindicator-0.3.15.tar.gz +c79f659bdcb89bb4152cecb4ed31fe49 libindicator-0.3.17.tar.gz From f9e76e27bcfdfe6a7186e45ad4417115d863c239 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 2 Feb 2011 12:49:41 -0500 Subject: [PATCH 05/46] rebuild --- libindicator.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libindicator.spec b/libindicator.spec index 74daf14..c58cc6d 100644 --- a/libindicator.spec +++ b/libindicator.spec @@ -1,7 +1,7 @@ Summary: Shared functions for Ayatana indicators Name: libindicator Version: 0.3.17 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv3 Group: System Environment/Libraries URL: https://launchpad.net/libindicator @@ -135,6 +135,9 @@ rm -f %{buildroot}%{_libdir}/libdummy-indicator*.so %{_libdir}/pkgconfig/indicator3.pc %changelog +* Wed Feb 2 2011 Matthias Clasen - 0.3.17-2 + Rebuild against newer gtk3 + * Sun Jan 23 2011 Adam Williamson - 0.3.17-1 - new version 0.3.17 - drop both patches (upstream) From 1056bae5b6d5acc9a8ad5ce96749a818f8f38540 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 2 Feb 2011 12:47:42 -0500 Subject: [PATCH 06/46] rebuild --- libindicator.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/libindicator.spec b/libindicator.spec index c58cc6d..68bcd0f 100644 --- a/libindicator.spec +++ b/libindicator.spec @@ -7,6 +7,7 @@ Group: System Environment/Libraries URL: https://launchpad.net/libindicator Source0: http://launchpad.net/libindicator/0.3/%{version}/+download/%{name}-%{version}.tar.gz + BuildRequires: gtk-doc BuildRequires: libtool BuildRequires: dbus-glib-devel From 9e4d1917576b0ede40c397d33ebafd2346e4150c Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Tue, 8 Feb 2011 01:01:52 -0600 Subject: [PATCH 07/46] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- libindicator.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libindicator.spec b/libindicator.spec index 68bcd0f..0e55e55 100644 --- a/libindicator.spec +++ b/libindicator.spec @@ -1,7 +1,7 @@ Summary: Shared functions for Ayatana indicators Name: libindicator Version: 0.3.17 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv3 Group: System Environment/Libraries URL: https://launchpad.net/libindicator @@ -136,6 +136,9 @@ rm -f %{buildroot}%{_libdir}/libdummy-indicator*.so %{_libdir}/pkgconfig/indicator3.pc %changelog +* Tue Feb 08 2011 Fedora Release Engineering - 0.3.17-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Wed Feb 2 2011 Matthias Clasen - 0.3.17-2 Rebuild against newer gtk3 From b35e4871d3bdea0c2963a62dc3933e5df4346765 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Thu, 10 Feb 2011 20:23:11 -0500 Subject: [PATCH 08/46] rebuild --- libindicator.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libindicator.spec b/libindicator.spec index 0e55e55..def4cd9 100644 --- a/libindicator.spec +++ b/libindicator.spec @@ -1,7 +1,7 @@ Summary: Shared functions for Ayatana indicators Name: libindicator Version: 0.3.17 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv3 Group: System Environment/Libraries URL: https://launchpad.net/libindicator @@ -136,6 +136,9 @@ rm -f %{buildroot}%{_libdir}/libdummy-indicator*.so %{_libdir}/pkgconfig/indicator3.pc %changelog +* Thu Feb 10 2011 Matthias Clasen - 0.3.17-4 + Rebuild against newer gtk3 + * Tue Feb 08 2011 Fedora Release Engineering - 0.3.17-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild From 17c6a6fd3c4640024e9924595f21a51d22733ca8 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Mon, 7 Mar 2011 16:09:00 -0800 Subject: [PATCH 09/46] - new release 0.3.20 --- .gitignore | 1 + libindicator.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 6c05229..45f862a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /libindicator-0.3.15.tar.gz /libindicator-0.3.17.tar.gz +/libindicator-0.3.20.tar.gz diff --git a/libindicator.spec b/libindicator.spec index 74daf14..0e16f5e 100644 --- a/libindicator.spec +++ b/libindicator.spec @@ -1,6 +1,6 @@ Summary: Shared functions for Ayatana indicators Name: libindicator -Version: 0.3.17 +Version: 0.3.20 Release: 1%{?dist} License: GPLv3 Group: System Environment/Libraries @@ -135,6 +135,9 @@ rm -f %{buildroot}%{_libdir}/libdummy-indicator*.so %{_libdir}/pkgconfig/indicator3.pc %changelog +* Mon Mar 07 2011 Adam Williamson - 0.3.20-1 +- new release 0.3.20 + * Sun Jan 23 2011 Adam Williamson - 0.3.17-1 - new version 0.3.17 - drop both patches (upstream) diff --git a/sources b/sources index 9dea491..be268cb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c79f659bdcb89bb4152cecb4ed31fe49 libindicator-0.3.17.tar.gz +97954c01c56f88e657b9b22dbd70ebc3 libindicator-0.3.20.tar.gz From 510aed6681c097d64506fc39f5f9f912e8ffc789 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Mon, 7 Mar 2011 16:10:43 -0800 Subject: [PATCH 10/46] finish cleaning up the stupid merge --- libindicator.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/libindicator.spec b/libindicator.spec index 640f926..dc5db6e 100644 --- a/libindicator.spec +++ b/libindicator.spec @@ -147,7 +147,6 @@ rm -f %{buildroot}%{_libdir}/libdummy-indicator*.so * Wed Feb 2 2011 Matthias Clasen - 0.3.17-2 Rebuild against newer gtk3 ->>>>>>> b35e4871d3bdea0c2963a62dc3933e5df4346765 * Sun Jan 23 2011 Adam Williamson - 0.3.17-1 - new version 0.3.17 From 6323ff192dddc287aa171bd95e822cfc633bc53a Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Wed, 23 Mar 2011 18:50:49 -0700 Subject: [PATCH 11/46] new release 0.3.22 --- .gitignore | 1 + libindicator.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 45f862a..81504d9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /libindicator-0.3.15.tar.gz /libindicator-0.3.17.tar.gz /libindicator-0.3.20.tar.gz +/libindicator-0.3.22.tar.gz diff --git a/libindicator.spec b/libindicator.spec index dc5db6e..6d461cf 100644 --- a/libindicator.spec +++ b/libindicator.spec @@ -1,6 +1,6 @@ Summary: Shared functions for Ayatana indicators Name: libindicator -Version: 0.3.20 +Version: 0.3.22 Release: 1%{?dist} License: GPLv3 Group: System Environment/Libraries @@ -136,6 +136,9 @@ rm -f %{buildroot}%{_libdir}/libdummy-indicator*.so %{_libdir}/pkgconfig/indicator3.pc %changelog +* Wed Mar 23 2011 Adam Williamson - 0.3.22-1 +- new release 0.3.22 + * Mon Mar 07 2011 Adam Williamson - 0.3.20-1 - new release 0.3.20 diff --git a/sources b/sources index be268cb..65880ce 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -97954c01c56f88e657b9b22dbd70ebc3 libindicator-0.3.20.tar.gz +9cbd9724375718dd06b86ac3d668e548 libindicator-0.3.22.tar.gz From 6691a1c8b2b0abb5e0cd7839a9b09118a9be3e89 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Tue, 6 Dec 2011 00:07:02 -0500 Subject: [PATCH 12/46] Rebuild for new libpng --- libindicator.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libindicator.spec b/libindicator.spec index 6d461cf..80b19a5 100644 --- a/libindicator.spec +++ b/libindicator.spec @@ -1,7 +1,7 @@ Summary: Shared functions for Ayatana indicators Name: libindicator Version: 0.3.22 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv3 Group: System Environment/Libraries URL: https://launchpad.net/libindicator @@ -136,6 +136,9 @@ rm -f %{buildroot}%{_libdir}/libdummy-indicator*.so %{_libdir}/pkgconfig/indicator3.pc %changelog +* Tue Dec 06 2011 Adam Jackson - 0.3.22-2 +- Rebuild for new libpng + * Wed Mar 23 2011 Adam Williamson - 0.3.22-1 - new release 0.3.22 From ca5cd79db223afe3692f7a2d30bc1a78550e59a3 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 13 Jan 2012 01:54:05 -0600 Subject: [PATCH 13/46] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- libindicator.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libindicator.spec b/libindicator.spec index 80b19a5..b1cb35c 100644 --- a/libindicator.spec +++ b/libindicator.spec @@ -1,7 +1,7 @@ Summary: Shared functions for Ayatana indicators Name: libindicator Version: 0.3.22 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv3 Group: System Environment/Libraries URL: https://launchpad.net/libindicator @@ -136,6 +136,9 @@ rm -f %{buildroot}%{_libdir}/libdummy-indicator*.so %{_libdir}/pkgconfig/indicator3.pc %changelog +* Fri Jan 13 2012 Fedora Release Engineering - 0.3.22-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Tue Dec 06 2011 Adam Jackson - 0.3.22-2 - Rebuild for new libpng From d2eba64be653467728b0db9befc387fe002e8729 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Sat, 31 Mar 2012 15:11:18 -0400 Subject: [PATCH 14/46] update to 0.4.94 --- .gitignore | 1 + libindicator.spec | 39 +++++++++++++++++++-------------------- sources | 2 +- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/.gitignore b/.gitignore index 81504d9..1a5e0ed 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /libindicator-0.3.17.tar.gz /libindicator-0.3.20.tar.gz /libindicator-0.3.22.tar.gz +/libindicator-0.4.94.tar.gz diff --git a/libindicator.spec b/libindicator.spec index b1cb35c..c58d373 100644 --- a/libindicator.spec +++ b/libindicator.spec @@ -1,13 +1,11 @@ Summary: Shared functions for Ayatana indicators Name: libindicator -Version: 0.3.22 -Release: 3%{?dist} +Version: 0.4.94 +Release: 1%{?dist} License: GPLv3 Group: System Environment/Libraries URL: https://launchpad.net/libindicator -Source0: http://launchpad.net/libindicator/0.3/%{version}/+download/%{name}-%{version}.tar.gz - - +Source0: http://launchpad.net/libindicator/0.5/%{version}/+download/%{name}-%{version}.tar.gz BuildRequires: gtk-doc BuildRequires: libtool BuildRequires: dbus-glib-devel @@ -29,7 +27,7 @@ Ayatana indicators system. %package devel Summary: Development files for %{name} Group: Development/Libraries -Requires: %{name} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} Requires: pkgconfig %description devel @@ -57,7 +55,7 @@ tools for the GTK+3 build of %{name}. %package gtk3-devel Summary: Development files for %{name}-gtk3 Group: Development/Libraries -Requires: %{name}-gtk3 = %{version}-%{release} +Requires: %{name}-gtk3{?_isa} = %{version}-%{release} Requires: pkgconfig %description gtk3-devel @@ -77,16 +75,19 @@ developing applications that use %{name}-gtk3. rm -rf build-gtk3 build-gtk2 mkdir build-gtk3 build-gtk2 pushd build-gtk2 -%configure --disable-static +%configure --disable-static --with-gtk=2 +sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool +sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool make %{?_smp_mflags} popd pushd build-gtk3 %configure --disable-static --with-gtk=3 +sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool +sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool make %{?_smp_mflags} popd %install -rm -rf %{buildroot} make -C build-gtk2 DESTDIR=%{buildroot} install make -C build-gtk3 DESTDIR=%{buildroot} install find %{buildroot} -regex ".*\.la$" | xargs rm -f -- @@ -100,42 +101,40 @@ rm -f %{buildroot}%{_libdir}/libdummy-indicator*.so %postun gtk3 -p /sbin/ldconfig %files -%defattr(-,root,root,-) %doc COPYING %{_libdir}/libindicator.so.* %files tools -%defattr(-,root,root,-) %doc COPYING %{_libexecdir}/indicator-loader %files devel -%defattr(-,root,root,-) %doc COPYING -%{_includedir}/libindicator-0.3 +%{_includedir}/libindicator-0.4 %{_libdir}/libindicator.so -%{_libdir}/pkgconfig/indicator.pc +%{_libdir}/pkgconfig/indicator-0.4.pc +# Contains 80indicator-debugging # This is marked as 'for development use only' -%{_sysconfdir}/X11/Xsession.d/80indicator-debugging +%{_datadir}/libindicator/ %files gtk3 -%defattr(-,root,root,-) %doc COPYING %{_libdir}/libindicator3.so.* %files gtk3-tools -%defattr(-,root,root,-) %doc COPYING %{_libexecdir}/indicator-loader3 %files gtk3-devel -%defattr(-,root,root,-) %doc COPYING -%{_includedir}/libindicator3-0.3 +%{_includedir}/libindicator3-0.4 %{_libdir}/libindicator3.so -%{_libdir}/pkgconfig/indicator3.pc +%{_libdir}/pkgconfig/indicator3-0.4.pc %changelog +* Sat Mar 31 2012 Tom Callaway - 0.4.94-1 +- Update to 0.4.94 + * Fri Jan 13 2012 Fedora Release Engineering - 0.3.22-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild diff --git a/sources b/sources index 65880ce..4f5bdbb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9cbd9724375718dd06b86ac3d668e548 libindicator-0.3.22.tar.gz +b7093979cacf24001834e231c89fe05f libindicator-0.4.94.tar.gz From 32c12ed670b85c81ec5869256d37208791f0a6b1 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Sat, 31 Mar 2012 21:02:02 -0400 Subject: [PATCH 15/46] fix typo causing dep issues --- libindicator.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libindicator.spec b/libindicator.spec index c58d373..760559e 100644 --- a/libindicator.spec +++ b/libindicator.spec @@ -1,7 +1,7 @@ Summary: Shared functions for Ayatana indicators Name: libindicator Version: 0.4.94 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv3 Group: System Environment/Libraries URL: https://launchpad.net/libindicator @@ -55,7 +55,7 @@ tools for the GTK+3 build of %{name}. %package gtk3-devel Summary: Development files for %{name}-gtk3 Group: Development/Libraries -Requires: %{name}-gtk3{?_isa} = %{version}-%{release} +Requires: %{name}-gtk3%{?_isa} = %{version}-%{release} Requires: pkgconfig %description gtk3-devel @@ -132,6 +132,9 @@ rm -f %{buildroot}%{_libdir}/libdummy-indicator*.so %{_libdir}/pkgconfig/indicator3-0.4.pc %changelog +* Sat Mar 31 2012 Tom Callaway - 0.4.94-2 +- fix typo causing dep issues + * Sat Mar 31 2012 Tom Callaway - 0.4.94-1 - Update to 0.4.94 From 3aff4ef232cf1de9e9fab05e61955b1aab8cdffd Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 19 Jul 2012 15:10:48 -0500 Subject: [PATCH 16/46] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- libindicator.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libindicator.spec b/libindicator.spec index 760559e..431be24 100644 --- a/libindicator.spec +++ b/libindicator.spec @@ -1,7 +1,7 @@ Summary: Shared functions for Ayatana indicators Name: libindicator Version: 0.4.94 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv3 Group: System Environment/Libraries URL: https://launchpad.net/libindicator @@ -132,6 +132,9 @@ rm -f %{buildroot}%{_libdir}/libdummy-indicator*.so %{_libdir}/pkgconfig/indicator3-0.4.pc %changelog +* Thu Jul 19 2012 Fedora Release Engineering - 0.4.94-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Sat Mar 31 2012 Tom Callaway - 0.4.94-2 - fix typo causing dep issues From b9232034b41db4ad8d4b603ec20aba292e0d3dd2 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 13 Feb 2013 22:34:25 -0600 Subject: [PATCH 17/46] - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild --- libindicator.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libindicator.spec b/libindicator.spec index 431be24..ff96db0 100644 --- a/libindicator.spec +++ b/libindicator.spec @@ -1,7 +1,7 @@ Summary: Shared functions for Ayatana indicators Name: libindicator Version: 0.4.94 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv3 Group: System Environment/Libraries URL: https://launchpad.net/libindicator @@ -132,6 +132,9 @@ rm -f %{buildroot}%{_libdir}/libdummy-indicator*.so %{_libdir}/pkgconfig/indicator3-0.4.pc %changelog +* Thu Feb 14 2013 Fedora Release Engineering - 0.4.94-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + * Thu Jul 19 2012 Fedora Release Engineering - 0.4.94-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild From 091a529da0e4e9b27077f7677f9fcf8c8837fbad Mon Sep 17 00:00:00 2001 From: Eduardo Echeverria Date: Fri, 31 May 2013 01:09:10 -0430 Subject: [PATCH 18/46] Update to 12.10.1 --- .gitignore | 1 + libindicator.spec | 161 +++++++++++++++++++++++++++++----------------- sources | 2 +- 3 files changed, 104 insertions(+), 60 deletions(-) diff --git a/.gitignore b/.gitignore index 1a5e0ed..e28e02c 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /libindicator-0.3.20.tar.gz /libindicator-0.3.22.tar.gz /libindicator-0.4.94.tar.gz +/libindicator-12.10.1.tar.gz diff --git a/libindicator.spec b/libindicator.spec index ff96db0..02efd1a 100644 --- a/libindicator.spec +++ b/libindicator.spec @@ -1,137 +1,179 @@ -Summary: Shared functions for Ayatana indicators Name: libindicator -Version: 0.4.94 -Release: 4%{?dist} -License: GPLv3 +Version: 12.10.1 +Release: 1%{?dist} +Summary: Shared functions for Ayatana indicators + Group: System Environment/Libraries +License: GPLv3 URL: https://launchpad.net/libindicator -Source0: http://launchpad.net/libindicator/0.5/%{version}/+download/%{name}-%{version}.tar.gz +Source0: https://launchpad.net/libindicator/12.10/12.10.1/+download/%{name}-%{version}.tar.gz + +BuildRequires: chrpath BuildRequires: gtk-doc BuildRequires: libtool +BuildRequires: pkgconfig + BuildRequires: dbus-glib-devel BuildRequires: gtk2-devel BuildRequires: gtk3-devel -%description -A set of symbols and convenience functions that all Ayatana indicators -are likely to use. -%package tools -Summary: Tools for %{name} -Group: System Environment/Libraries +%description +A set of symbols and convenience functions that all Ayatana indicators are +likely to use. -%description tools -This package contains tools used by the %{name} package, the -Ayatana indicators system. -%package devel +%package devel Summary: Development files for %{name} Group: Development/Libraries Requires: %{name}%{?_isa} = %{version}-%{release} Requires: pkgconfig -%description devel +%description devel The %{name}-devel package contains libraries and header files for developing applications that use %{name}. -%package gtk3 + +%package tools +Summary: Shared functions for Ayatana indicators - Tools +Group: Development/Tools +Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: pkgconfig + +%description tools +This package contains tools used by the %{name} package, the +Ayatana indicators system. + + +%package gtk3 Summary: GTK+3 build of %{name} Group: System Environment/Libraries -%description gtk3 +%description gtk3 A set of symbols and convenience functions that all Ayatana indicators are likely to use. This is the GTK+ 3 build of %{name}, for use by GTK+ 3 apps. -%package gtk3-tools -Summary: Tools for %{name} -Group: System Environment/Libraries - -%description gtk3-tools -This package contains tools used by the %{name}-gtk3 package, the -Ayatana indicators system. This package contains the builds of the -tools for the GTK+3 build of %{name}. -%package gtk3-devel +%package gtk3-devel Summary: Development files for %{name}-gtk3 Group: Development/Libraries + Requires: %{name}-gtk3%{?_isa} = %{version}-%{release} Requires: pkgconfig -%description gtk3-devel +%description gtk3-devel The %{name}-gtk3-devel package contains libraries and header files for developing applications that use %{name}-gtk3. + +%package gtk3-tools +Summary: Shared functions for Ayatana indicators - GTK3 Tools +Group: Development/Tools + +Requires: %{name}-gtk3%{?_isa} = %{version}-%{release} +Requires: pkgconfig + +%description gtk3-tools +This package contains tools used by the %{name}-gtk3 package, the +Ayatana indicators system. This package contains the builds of the +tools for the GTK+3 build of %{name}. + + %prep %setup -q %build -# we build it twice, once against GTK+ 3 and once against GTK+ 2, so -# both GTK+ 2 and GTK+ 3 apps can use it; the GTK+ 3 build is -# libindicator-gtk3. When we have no need for the GTK+ 2 build any more -# we can drop the -gtk3 package and have the main package build against -# GTK+ 3. %global _configure ../configure -rm -rf build-gtk3 build-gtk2 -mkdir build-gtk3 build-gtk2 +rm -rf build-gtk2 build-gtk3 +mkdir build-gtk2 build-gtk3 + pushd build-gtk2 -%configure --disable-static --with-gtk=2 +export CFLAGS="%{optflags} -Wno-error=deprecated-declarations" +%configure --with-gtk=2 --disable-static +sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool make %{?_smp_mflags} popd + pushd build-gtk3 -%configure --disable-static --with-gtk=3 +export CFLAGS="%{optflags} -Wno-error=deprecated-declarations" +%configure --with-gtk=3 --disable-static +sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool make %{?_smp_mflags} popd + %install -make -C build-gtk2 DESTDIR=%{buildroot} install -make -C build-gtk3 DESTDIR=%{buildroot} install -find %{buildroot} -regex ".*\.la$" | xargs rm -f -- +pushd build-gtk2 +make install DESTDIR=%{buildroot} +popd + +pushd build-gtk3 +make install DESTDIR=%{buildroot} +popd + -# this dummy indicator is fairly useless, it's not shipped in Ubuntu +# Ubuntu doesn't package the dummy indicator rm -f %{buildroot}%{_libdir}/libdummy-indicator*.so +# Remove libtool files +find %{buildroot} -type f -name '*.la' -delete + + %post -p /sbin/ldconfig + %postun -p /sbin/ldconfig + + %post gtk3 -p /sbin/ldconfig + %postun gtk3 -p /sbin/ldconfig + %files -%doc COPYING +%doc AUTHORS COPYING NEWS ChangeLog %{_libdir}/libindicator.so.* -%files tools -%doc COPYING -%{_libexecdir}/indicator-loader -%files devel -%doc COPYING -%{_includedir}/libindicator-0.4 +%files devel +%dir %{_includedir}/libindicator-0.4/ +%dir %{_includedir}/libindicator-0.4/libindicator/ +%{_includedir}/libindicator-0.4/libindicator/*.h %{_libdir}/libindicator.so %{_libdir}/pkgconfig/indicator-0.4.pc -# Contains 80indicator-debugging -# This is marked as 'for development use only' -%{_datadir}/libindicator/ -%files gtk3 -%doc COPYING + +%files tools +%{_libexecdir}/indicator-loader +%dir %{_datadir}/libindicator/ +%{_datadir}/libindicator/80indicator-debugging + + +%files gtk3 +%doc AUTHORS COPYING NEWS ChangeLog %{_libdir}/libindicator3.so.* -%files gtk3-tools -%doc COPYING -%{_libexecdir}/indicator-loader3 -%files gtk3-devel -%doc COPYING -%{_includedir}/libindicator3-0.4 +%files gtk3-devel +%dir %{_includedir}/libindicator3-0.4/ +%dir %{_includedir}/libindicator3-0.4/libindicator/ +%{_includedir}/libindicator3-0.4/libindicator/*.h %{_libdir}/libindicator3.so %{_libdir}/pkgconfig/indicator3-0.4.pc + +%files gtk3-tools +%{_libexecdir}/indicator-loader3 + %changelog +* Thu May 30 2013 Eduardo Echeverria - 12.10.1-1 +- Update to 12.10.1 +- Add GTK2 support + * Thu Feb 14 2013 Fedora Release Engineering - 0.4.94-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild @@ -175,3 +217,4 @@ rm -f %{buildroot}%{_libdir}/libdummy-indicator*.so * Fri Dec 03 2010 Adam Williamson - 0.3.15-1 - initial package + diff --git a/sources b/sources index 4f5bdbb..f9c0036 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b7093979cacf24001834e231c89fe05f libindicator-0.4.94.tar.gz +5fd4d6bab339fc9611078b64c44a85a8 libindicator-12.10.1.tar.gz From d4dc535bc2c7f750f28653fa0010d626a463b8e3 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 3 Aug 2013 00:52:11 -0500 Subject: [PATCH 19/46] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- libindicator.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libindicator.spec b/libindicator.spec index 02efd1a..381bdcb 100644 --- a/libindicator.spec +++ b/libindicator.spec @@ -1,6 +1,6 @@ Name: libindicator Version: 12.10.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Shared functions for Ayatana indicators Group: System Environment/Libraries @@ -170,6 +170,9 @@ find %{buildroot} -type f -name '*.la' -delete %{_libexecdir}/indicator-loader3 %changelog +* Sat Aug 03 2013 Fedora Release Engineering - 12.10.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Thu May 30 2013 Eduardo Echeverria - 12.10.1-1 - Update to 12.10.1 - Add GTK2 support From 6eb39664a1113b35ed205839dec07bb1bb30d0b6 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 6 Jun 2014 22:53:27 -0500 Subject: [PATCH 20/46] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- libindicator.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libindicator.spec b/libindicator.spec index 381bdcb..f762c06 100644 --- a/libindicator.spec +++ b/libindicator.spec @@ -1,6 +1,6 @@ Name: libindicator Version: 12.10.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Shared functions for Ayatana indicators Group: System Environment/Libraries @@ -170,6 +170,9 @@ find %{buildroot} -type f -name '*.la' -delete %{_libexecdir}/indicator-loader3 %changelog +* Sat Jun 07 2014 Fedora Release Engineering - 12.10.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Sat Aug 03 2013 Fedora Release Engineering - 12.10.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild From 52163ee3f4b76aa82080e3f19b6064fe6754c2f0 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sun, 17 Aug 2014 03:58:43 +0000 Subject: [PATCH 21/46] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- libindicator.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libindicator.spec b/libindicator.spec index f762c06..210ac25 100644 --- a/libindicator.spec +++ b/libindicator.spec @@ -1,6 +1,6 @@ Name: libindicator Version: 12.10.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Shared functions for Ayatana indicators Group: System Environment/Libraries @@ -170,6 +170,9 @@ find %{buildroot} -type f -name '*.la' -delete %{_libexecdir}/indicator-loader3 %changelog +* Sun Aug 17 2014 Fedora Release Engineering - 12.10.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Sat Jun 07 2014 Fedora Release Engineering - 12.10.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From 1faa8b88915671b15670e96fb21d51a840ba0b91 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 17 Jun 2015 15:51:35 +0000 Subject: [PATCH 22/46] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- libindicator.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libindicator.spec b/libindicator.spec index 210ac25..f9690f9 100644 --- a/libindicator.spec +++ b/libindicator.spec @@ -1,6 +1,6 @@ Name: libindicator Version: 12.10.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Shared functions for Ayatana indicators Group: System Environment/Libraries @@ -170,6 +170,9 @@ find %{buildroot} -type f -name '*.la' -delete %{_libexecdir}/indicator-loader3 %changelog +* Wed Jun 17 2015 Fedora Release Engineering - 12.10.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Sun Aug 17 2014 Fedora Release Engineering - 12.10.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild From c016aed4a83b1bb0bde2e261304e3d73221ac538 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 4 Feb 2016 03:20:38 +0000 Subject: [PATCH 23/46] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- libindicator.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libindicator.spec b/libindicator.spec index f9690f9..97f5897 100644 --- a/libindicator.spec +++ b/libindicator.spec @@ -1,6 +1,6 @@ Name: libindicator Version: 12.10.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Shared functions for Ayatana indicators Group: System Environment/Libraries @@ -170,6 +170,9 @@ find %{buildroot} -type f -name '*.la' -delete %{_libexecdir}/indicator-loader3 %changelog +* Thu Feb 04 2016 Fedora Release Engineering - 12.10.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Wed Jun 17 2015 Fedora Release Engineering - 12.10.1-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From 6eb48118247957d7e7595ab0bc5da8e70c8899b0 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 4 Feb 2016 19:33:39 +0900 Subject: [PATCH 24/46] F-24: fix FTBFS (variable expansion: perhaps due to bash behavior change) --- libindicator.spec | 32 +++++++++++++++++++++++++++++--- 1 file changed, 29 insertions(+), 3 deletions(-) diff --git a/libindicator.spec b/libindicator.spec index 97f5897..0a23f0c 100644 --- a/libindicator.spec +++ b/libindicator.spec @@ -1,6 +1,6 @@ Name: libindicator Version: 12.10.1 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Shared functions for Ayatana indicators Group: System Environment/Libraries @@ -17,6 +17,7 @@ BuildRequires: dbus-glib-devel BuildRequires: gtk2-devel BuildRequires: gtk3-devel +BuildRequires: gnome-common %description A set of symbols and convenience functions that all Ayatana indicators are @@ -83,6 +84,28 @@ tools for the GTK+3 build of %{name}. %prep %setup -q +sed -i.addvar configure.ac \ + -e '\@LIBINDICATOR_LIBS@s|\$LIBM| \$LIBM|' + +# http://bazaar.launchpad.net/~indicator-applet-developers/libindicator/trunk.12.10/view/head:/autogen.sh +cat > autogen.sh < - 12.10.1-7 +- F-24: fix FTBFS (variable expansion: perhaps due to bash behavior change) + * Thu Feb 04 2016 Fedora Release Engineering - 12.10.1-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From 34acf32b33b31e075b7dbee3234c2896cc78928a Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 15 Nov 2016 17:56:38 +0900 Subject: [PATCH 25/46] Create and own indicatordir, iconsdir (bug 1392864) --- libindicator.spec | 38 +++++++++++++++++++++++++++++++++++--- 1 file changed, 35 insertions(+), 3 deletions(-) diff --git a/libindicator.spec b/libindicator.spec index 0a23f0c..ae44955 100644 --- a/libindicator.spec +++ b/libindicator.spec @@ -1,6 +1,6 @@ Name: libindicator Version: 12.10.1 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Shared functions for Ayatana indicators Group: System Environment/Libraries @@ -134,10 +134,35 @@ popd pushd build-gtk2 make install DESTDIR=%{buildroot} popd +( + PKG_CONFIG_PATH=%{buildroot}%{_libdir}/pkg-config + export PKG_CONFIG_PATH + for var in \ + iconsdir \ + indicatordir \ + %{nil} + do + vardir=$(pkg-config --variable=${var} indicator-0.4) + mkdir -p %{buildroot}${vardir} + done +) pushd build-gtk3 make install DESTDIR=%{buildroot} popd +( + PKG_CONFIG_PATH=%{buildroot}%{_libdir}/pkg-config + export PKG_CONFIG_PATH + for var in \ + iconsdir \ + indicatordir \ + %{nil} + do + vardir=$(pkg-config --variable=${var} indicator3-0.4) + mkdir -p %{buildroot}${vardir} + done +) + # Ubuntu doesn't package the dummy indicator @@ -160,7 +185,9 @@ find %{buildroot} -type f -name '*.la' -delete %files %doc AUTHORS COPYING NEWS ChangeLog %{_libdir}/libindicator.so.* - +%dir %{_datadir}/libindicator/ +%dir %{_datadir}/libindicator/icons/ +%{_libdir}/indicators/ %files devel %dir %{_includedir}/libindicator-0.4/ @@ -172,13 +199,15 @@ find %{buildroot} -type f -name '*.la' -delete %files tools %{_libexecdir}/indicator-loader -%dir %{_datadir}/libindicator/ %{_datadir}/libindicator/80indicator-debugging %files gtk3 %doc AUTHORS COPYING NEWS ChangeLog %{_libdir}/libindicator3.so.* +%dir %{_datadir}/libindicator/ +%dir %{_datadir}/libindicator/icons/ +%{_libdir}/indicators3/ %files gtk3-devel @@ -193,6 +222,9 @@ find %{buildroot} -type f -name '*.la' -delete %{_libexecdir}/indicator-loader3 %changelog +* Tue Nov 15 2016 Mamoru TASAKA - 12.10.1-8 +- Create and own indicatordir, iconsdir (bug 1392864) + * Thu Feb 4 2016 Mamoru TASAKA - 12.10.1-7 - F-24: fix FTBFS (variable expansion: perhaps due to bash behavior change) From d29a60d821926aef5976a011261aee34e6238d28 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 15 Nov 2016 18:04:12 +0900 Subject: [PATCH 26/46] oops... --- libindicator.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libindicator.spec b/libindicator.spec index ae44955..8a51e02 100644 --- a/libindicator.spec +++ b/libindicator.spec @@ -135,7 +135,7 @@ pushd build-gtk2 make install DESTDIR=%{buildroot} popd ( - PKG_CONFIG_PATH=%{buildroot}%{_libdir}/pkg-config + PKG_CONFIG_PATH=%{buildroot}%{_libdir}/pkgconfig export PKG_CONFIG_PATH for var in \ iconsdir \ @@ -151,7 +151,7 @@ pushd build-gtk3 make install DESTDIR=%{buildroot} popd ( - PKG_CONFIG_PATH=%{buildroot}%{_libdir}/pkg-config + PKG_CONFIG_PATH=%{buildroot}%{_libdir}/pkgconfig export PKG_CONFIG_PATH for var in \ iconsdir \ From ce2eba33a59a6256c257dc7e790b3995c989fcbb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 10 Feb 2017 18:51:01 +0000 Subject: [PATCH 27/46] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- libindicator.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libindicator.spec b/libindicator.spec index 8a51e02..d12bf85 100644 --- a/libindicator.spec +++ b/libindicator.spec @@ -1,6 +1,6 @@ Name: libindicator Version: 12.10.1 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Shared functions for Ayatana indicators Group: System Environment/Libraries @@ -222,6 +222,9 @@ find %{buildroot} -type f -name '*.la' -delete %{_libexecdir}/indicator-loader3 %changelog +* Fri Feb 10 2017 Fedora Release Engineering - 12.10.1-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Tue Nov 15 2016 Mamoru TASAKA - 12.10.1-8 - Create and own indicatordir, iconsdir (bug 1392864) From 339e3ae411058de849a4ace89ebe462494a6f233 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 26 Jul 2017 19:03:31 +0000 Subject: [PATCH 28/46] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- libindicator.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libindicator.spec b/libindicator.spec index d12bf85..ab796c5 100644 --- a/libindicator.spec +++ b/libindicator.spec @@ -1,6 +1,6 @@ Name: libindicator Version: 12.10.1 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Shared functions for Ayatana indicators Group: System Environment/Libraries @@ -222,6 +222,9 @@ find %{buildroot} -type f -name '*.la' -delete %{_libexecdir}/indicator-loader3 %changelog +* Wed Jul 26 2017 Fedora Release Engineering - 12.10.1-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Fri Feb 10 2017 Fedora Release Engineering - 12.10.1-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From b60b2bbcfb68d39af256b921780fb75720250530 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 3 Aug 2017 01:39:26 +0000 Subject: [PATCH 29/46] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- libindicator.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libindicator.spec b/libindicator.spec index ab796c5..f0a1246 100644 --- a/libindicator.spec +++ b/libindicator.spec @@ -1,6 +1,6 @@ Name: libindicator Version: 12.10.1 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Shared functions for Ayatana indicators Group: System Environment/Libraries @@ -222,6 +222,9 @@ find %{buildroot} -type f -name '*.la' -delete %{_libexecdir}/indicator-loader3 %changelog +* Thu Aug 03 2017 Fedora Release Engineering - 12.10.1-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Wed Jul 26 2017 Fedora Release Engineering - 12.10.1-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 202083e2a7715d8ad5c08c9971bacff2757910a9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 7 Feb 2018 21:57:27 +0000 Subject: [PATCH 30/46] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libindicator.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libindicator.spec b/libindicator.spec index f0a1246..22b066c 100644 --- a/libindicator.spec +++ b/libindicator.spec @@ -1,6 +1,6 @@ Name: libindicator Version: 12.10.1 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Shared functions for Ayatana indicators Group: System Environment/Libraries @@ -222,6 +222,9 @@ find %{buildroot} -type f -name '*.la' -delete %{_libexecdir}/indicator-loader3 %changelog +* Wed Feb 07 2018 Fedora Release Engineering - 12.10.1-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Thu Aug 03 2017 Fedora Release Engineering - 12.10.1-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From d7594e9190dfe14cd7a36fce27ac60361fcb37aa Mon Sep 17 00:00:00 2001 From: Tomas Popela Date: Fri, 25 May 2018 09:37:23 +0200 Subject: [PATCH 31/46] Remove the Group tag --- libindicator.spec | 6 ------ 1 file changed, 6 deletions(-) diff --git a/libindicator.spec b/libindicator.spec index 22b066c..8870d71 100644 --- a/libindicator.spec +++ b/libindicator.spec @@ -3,7 +3,6 @@ Version: 12.10.1 Release: 12%{?dist} Summary: Shared functions for Ayatana indicators -Group: System Environment/Libraries License: GPLv3 URL: https://launchpad.net/libindicator Source0: https://launchpad.net/libindicator/12.10/12.10.1/+download/%{name}-%{version}.tar.gz @@ -26,7 +25,6 @@ likely to use. %package devel Summary: Development files for %{name} -Group: Development/Libraries Requires: %{name}%{?_isa} = %{version}-%{release} Requires: pkgconfig @@ -37,7 +35,6 @@ developing applications that use %{name}. %package tools Summary: Shared functions for Ayatana indicators - Tools -Group: Development/Tools Requires: %{name}%{?_isa} = %{version}-%{release} Requires: pkgconfig @@ -48,7 +45,6 @@ Ayatana indicators system. %package gtk3 Summary: GTK+3 build of %{name} -Group: System Environment/Libraries %description gtk3 A set of symbols and convenience functions that all Ayatana indicators @@ -58,7 +54,6 @@ by GTK+ 3 apps. %package gtk3-devel Summary: Development files for %{name}-gtk3 -Group: Development/Libraries Requires: %{name}-gtk3%{?_isa} = %{version}-%{release} Requires: pkgconfig @@ -70,7 +65,6 @@ developing applications that use %{name}-gtk3. %package gtk3-tools Summary: Shared functions for Ayatana indicators - GTK3 Tools -Group: Development/Tools Requires: %{name}-gtk3%{?_isa} = %{version}-%{release} Requires: pkgconfig From b00e2331a7ef6d429ed98ddd486cbb514478c2ca Mon Sep 17 00:00:00 2001 From: Tomas Popela Date: Fri, 25 May 2018 09:38:34 +0200 Subject: [PATCH 32/46] Move to ldconfig_scriptlets --- libindicator.spec | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/libindicator.spec b/libindicator.spec index 8870d71..e54bc4c 100644 --- a/libindicator.spec +++ b/libindicator.spec @@ -165,15 +165,8 @@ rm -f %{buildroot}%{_libdir}/libdummy-indicator*.so # Remove libtool files find %{buildroot} -type f -name '*.la' -delete - -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig - - -%post gtk3 -p /sbin/ldconfig - -%postun gtk3 -p /sbin/ldconfig +%ldconfig_scriptlets +%ldconfig_scriptlets gtk3 %files From 52566ec54cce1278740d79ae77228f76f20b4ff0 Mon Sep 17 00:00:00 2001 From: Tomas Popela Date: Fri, 25 May 2018 09:37:23 +0200 Subject: [PATCH 33/46] Remove the Group tag --- libindicator.spec | 6 ------ 1 file changed, 6 deletions(-) diff --git a/libindicator.spec b/libindicator.spec index 22b066c..8870d71 100644 --- a/libindicator.spec +++ b/libindicator.spec @@ -3,7 +3,6 @@ Version: 12.10.1 Release: 12%{?dist} Summary: Shared functions for Ayatana indicators -Group: System Environment/Libraries License: GPLv3 URL: https://launchpad.net/libindicator Source0: https://launchpad.net/libindicator/12.10/12.10.1/+download/%{name}-%{version}.tar.gz @@ -26,7 +25,6 @@ likely to use. %package devel Summary: Development files for %{name} -Group: Development/Libraries Requires: %{name}%{?_isa} = %{version}-%{release} Requires: pkgconfig @@ -37,7 +35,6 @@ developing applications that use %{name}. %package tools Summary: Shared functions for Ayatana indicators - Tools -Group: Development/Tools Requires: %{name}%{?_isa} = %{version}-%{release} Requires: pkgconfig @@ -48,7 +45,6 @@ Ayatana indicators system. %package gtk3 Summary: GTK+3 build of %{name} -Group: System Environment/Libraries %description gtk3 A set of symbols and convenience functions that all Ayatana indicators @@ -58,7 +54,6 @@ by GTK+ 3 apps. %package gtk3-devel Summary: Development files for %{name}-gtk3 -Group: Development/Libraries Requires: %{name}-gtk3%{?_isa} = %{version}-%{release} Requires: pkgconfig @@ -70,7 +65,6 @@ developing applications that use %{name}-gtk3. %package gtk3-tools Summary: Shared functions for Ayatana indicators - GTK3 Tools -Group: Development/Tools Requires: %{name}-gtk3%{?_isa} = %{version}-%{release} Requires: pkgconfig From 79213e7907ab8ccbcabd89744e147df2d5b2cbbe Mon Sep 17 00:00:00 2001 From: Tomas Popela Date: Fri, 25 May 2018 09:38:34 +0200 Subject: [PATCH 34/46] Move to ldconfig_scriptlets --- libindicator.spec | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/libindicator.spec b/libindicator.spec index 8870d71..e54bc4c 100644 --- a/libindicator.spec +++ b/libindicator.spec @@ -165,15 +165,8 @@ rm -f %{buildroot}%{_libdir}/libdummy-indicator*.so # Remove libtool files find %{buildroot} -type f -name '*.la' -delete - -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig - - -%post gtk3 -p /sbin/ldconfig - -%postun gtk3 -p /sbin/ldconfig +%ldconfig_scriptlets +%ldconfig_scriptlets gtk3 %files From 0237e274a7be478b8b64714ef950ebfee9d1189f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 13 Jul 2018 08:16:09 +0000 Subject: [PATCH 35/46] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libindicator.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libindicator.spec b/libindicator.spec index e54bc4c..19baedf 100644 --- a/libindicator.spec +++ b/libindicator.spec @@ -1,6 +1,6 @@ Name: libindicator Version: 12.10.1 -Release: 12%{?dist} +Release: 13%{?dist} Summary: Shared functions for Ayatana indicators License: GPLv3 @@ -209,6 +209,9 @@ find %{buildroot} -type f -name '*.la' -delete %{_libexecdir}/indicator-loader3 %changelog +* Fri Jul 13 2018 Fedora Release Engineering - 12.10.1-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Wed Feb 07 2018 Fedora Release Engineering - 12.10.1-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 411dc59ba3d50e894bce84f0fbd718859aa07c5a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 1 Feb 2019 07:23:20 +0000 Subject: [PATCH 36/46] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libindicator.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libindicator.spec b/libindicator.spec index 19baedf..6b431f6 100644 --- a/libindicator.spec +++ b/libindicator.spec @@ -1,6 +1,6 @@ Name: libindicator Version: 12.10.1 -Release: 13%{?dist} +Release: 14%{?dist} Summary: Shared functions for Ayatana indicators License: GPLv3 @@ -209,6 +209,9 @@ find %{buildroot} -type f -name '*.la' -delete %{_libexecdir}/indicator-loader3 %changelog +* Fri Feb 01 2019 Fedora Release Engineering - 12.10.1-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Fri Jul 13 2018 Fedora Release Engineering - 12.10.1-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From ca20ee30b797c98f7f1636f3d45fe7d6b03e7502 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jul 2019 13:31:50 +0000 Subject: [PATCH 37/46] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libindicator.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libindicator.spec b/libindicator.spec index 6b431f6..cc5a19f 100644 --- a/libindicator.spec +++ b/libindicator.spec @@ -1,6 +1,6 @@ Name: libindicator Version: 12.10.1 -Release: 14%{?dist} +Release: 15%{?dist} Summary: Shared functions for Ayatana indicators License: GPLv3 @@ -209,6 +209,9 @@ find %{buildroot} -type f -name '*.la' -delete %{_libexecdir}/indicator-loader3 %changelog +* Thu Jul 25 2019 Fedora Release Engineering - 12.10.1-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Fri Feb 01 2019 Fedora Release Engineering - 12.10.1-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 9b2cfb824a3ae52961ebd0b4a32ae8a5ab71e6ca Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 11 Nov 2019 20:18:48 +0900 Subject: [PATCH 38/46] F-31+: Adjust GLib 2.62 change --- ...1-glib262-g_define_type_with_private.patch | 80 +++++++++++++++++++ libindicator.spec | 10 ++- 2 files changed, 89 insertions(+), 1 deletion(-) create mode 100644 libindicator-12.10.1-glib262-g_define_type_with_private.patch diff --git a/libindicator-12.10.1-glib262-g_define_type_with_private.patch b/libindicator-12.10.1-glib262-g_define_type_with_private.patch new file mode 100644 index 0000000..af1e66b --- /dev/null +++ b/libindicator-12.10.1-glib262-g_define_type_with_private.patch @@ -0,0 +1,80 @@ +--- ./libindicator-12.10.1/libindicator/indicator-desktop-shortcuts.c.orig 2012-09-20 00:38:05.081903564 +0900 ++++ ./libindicator-12.10.1/libindicator/indicator-desktop-shortcuts.c 2019-11-11 20:16:21.088761001 +0900 +@@ -61,7 +61,7 @@ + }; + + #define INDICATOR_DESKTOP_SHORTCUTS_GET_PRIVATE(o) \ +- (G_TYPE_INSTANCE_GET_PRIVATE ((o), INDICATOR_TYPE_DESKTOP_SHORTCUTS, IndicatorDesktopShortcutsPrivate)) ++ (indicator_desktop_shortcuts_get_instance_private((IndicatorDesktopShortcuts *)o)) + + static void indicator_desktop_shortcuts_class_init (IndicatorDesktopShortcutsClass *klass); + static void indicator_desktop_shortcuts_init (IndicatorDesktopShortcuts *self); +@@ -72,7 +72,7 @@ + static void parse_keyfile (IndicatorDesktopShortcuts * ids); + static gboolean should_show (GKeyFile * keyfile, const gchar * group, const gchar * identity, gboolean should_have_target); + +-G_DEFINE_TYPE (IndicatorDesktopShortcuts, indicator_desktop_shortcuts, G_TYPE_OBJECT); ++G_DEFINE_TYPE_WITH_PRIVATE (IndicatorDesktopShortcuts, indicator_desktop_shortcuts, G_TYPE_OBJECT); + + /* Build up the class */ + static void +--- ./libindicator-12.10.1/libindicator/indicator-object.c.orig 2012-09-20 00:38:04.953839560 +0900 ++++ ./libindicator-12.10.1/libindicator/indicator-object.c 2019-11-11 20:15:09.145806133 +0900 +@@ -117,7 +117,7 @@ + static void indicator_object_entry_was_added (IndicatorObject*, IndicatorObjectEntry*); + static IndicatorObjectEntryPrivate * entry_get_private (IndicatorObject*, IndicatorObjectEntry*); + +-G_DEFINE_TYPE (IndicatorObject, indicator_object, G_TYPE_OBJECT); ++G_DEFINE_TYPE_WITH_PRIVATE (IndicatorObject, indicator_object, G_TYPE_OBJECT); + + /* Setup the class and put the functions into the + class structure */ +@@ -302,7 +302,7 @@ + static void + indicator_object_init (IndicatorObject *self) + { +- IndicatorObjectPrivate * priv = G_TYPE_INSTANCE_GET_PRIVATE (self, INDICATOR_OBJECT_TYPE, IndicatorObjectPrivate); ++ IndicatorObjectPrivate * priv = indicator_object_get_instance_private(self); + + priv->module = NULL; + +--- ./libindicator-12.10.1/libindicator/indicator-service-manager.c.orig 2012-09-20 00:38:05.057891563 +0900 ++++ ./libindicator-12.10.1/libindicator/indicator-service-manager.c 2019-11-11 20:15:09.145806133 +0900 +@@ -89,7 +89,7 @@ + + /* GObject Stuff */ + #define INDICATOR_SERVICE_MANAGER_GET_PRIVATE(o) \ +-(G_TYPE_INSTANCE_GET_PRIVATE ((o), INDICATOR_SERVICE_MANAGER_TYPE, IndicatorServiceManagerPrivate)) ++(indicator_service_manager_get_instance_private((IndicatorServiceManager *)o)) + + static void indicator_service_manager_class_init (IndicatorServiceManagerClass *klass); + static void indicator_service_manager_init (IndicatorServiceManager *self); +@@ -105,7 +105,7 @@ + static void service_proxy_cb (GObject * object, GAsyncResult * res, gpointer user_data); + static void service_proxy_name_changed (GDBusConnection * connection, const gchar * sender_name, const gchar * object_path, const gchar * interface_name, const gchar * signal_name, GVariant * parameters, gpointer user_data); + +-G_DEFINE_TYPE (IndicatorServiceManager, indicator_service_manager, G_TYPE_OBJECT); ++G_DEFINE_TYPE_WITH_PRIVATE (IndicatorServiceManager, indicator_service_manager, G_TYPE_OBJECT); + + /* Build all of our signals and proxies and tie everything + all together. Lovely. */ +--- ./libindicator-12.10.1/libindicator/indicator-service.c.orig 2012-09-20 00:38:05.009867562 +0900 ++++ ./libindicator-12.10.1/libindicator/indicator-service.c 2019-11-11 20:15:09.145806133 +0900 +@@ -83,7 +83,7 @@ + + /* GObject Stuff */ + #define INDICATOR_SERVICE_GET_PRIVATE(o) \ +- (G_TYPE_INSTANCE_GET_PRIVATE ((o), INDICATOR_SERVICE_TYPE, IndicatorServicePrivate)) ++ (indicator_service_get_instance_private((IndicatorService *)o)) + + static void indicator_service_class_init (IndicatorServiceClass *klass); + static void indicator_service_init (IndicatorService *self); +@@ -106,7 +106,7 @@ + }; + + /* THE define */ +-G_DEFINE_TYPE (IndicatorService, indicator_service, G_TYPE_OBJECT); ++G_DEFINE_TYPE_WITH_PRIVATE (IndicatorService, indicator_service, G_TYPE_OBJECT); + + static void + indicator_service_class_init (IndicatorServiceClass *klass) diff --git a/libindicator.spec b/libindicator.spec index cc5a19f..978fb73 100644 --- a/libindicator.spec +++ b/libindicator.spec @@ -1,11 +1,13 @@ Name: libindicator Version: 12.10.1 -Release: 15%{?dist} +Release: 16%{?dist} Summary: Shared functions for Ayatana indicators License: GPLv3 URL: https://launchpad.net/libindicator Source0: https://launchpad.net/libindicator/12.10/12.10.1/+download/%{name}-%{version}.tar.gz +# From GLib 2.62 +Patch1: libindicator-12.10.1-glib262-g_define_type_with_private.patch BuildRequires: chrpath BuildRequires: gtk-doc @@ -77,6 +79,9 @@ tools for the GTK+3 build of %{name}. %prep %setup -q +%if 0%{?fedora} >= 31 +%patch1 -p2 -b .orig +%endif sed -i.addvar configure.ac \ -e '\@LIBINDICATOR_LIBS@s|\$LIBM| \$LIBM|' @@ -209,6 +214,9 @@ find %{buildroot} -type f -name '*.la' -delete %{_libexecdir}/indicator-loader3 %changelog +* Mon Nov 11 2019 Mamoru TASAKA - 12.10.1-16 +- F-31+: Adjust GLib 2.62 change + * Thu Jul 25 2019 Fedora Release Engineering - 12.10.1-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From f19d4babd15850ca804dd5fcb6a561d998ee0f1c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jan 2020 09:25:10 +0000 Subject: [PATCH 39/46] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libindicator.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libindicator.spec b/libindicator.spec index 978fb73..e27e8c5 100644 --- a/libindicator.spec +++ b/libindicator.spec @@ -1,6 +1,6 @@ Name: libindicator Version: 12.10.1 -Release: 16%{?dist} +Release: 17%{?dist} Summary: Shared functions for Ayatana indicators License: GPLv3 @@ -214,6 +214,9 @@ find %{buildroot} -type f -name '*.la' -delete %{_libexecdir}/indicator-loader3 %changelog +* Wed Jan 29 2020 Fedora Release Engineering - 12.10.1-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Mon Nov 11 2019 Mamoru TASAKA - 12.10.1-16 - F-31+: Adjust GLib 2.62 change From a91926c675473ea96b4a0910cf059bc194c0dc8f Mon Sep 17 00:00:00 2001 From: Merlin Mathesius Date: Tue, 14 Jul 2020 12:47:58 -0500 Subject: [PATCH 40/46] Minor conditional fix for ELN Signed-off-by: Merlin Mathesius --- libindicator.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libindicator.spec b/libindicator.spec index e27e8c5..528a0be 100644 --- a/libindicator.spec +++ b/libindicator.spec @@ -1,6 +1,6 @@ Name: libindicator Version: 12.10.1 -Release: 17%{?dist} +Release: 18%{?dist} Summary: Shared functions for Ayatana indicators License: GPLv3 @@ -79,7 +79,7 @@ tools for the GTK+3 build of %{name}. %prep %setup -q -%if 0%{?fedora} >= 31 +%if 0%{?fedora} >= 31 || 0%{?rhel} >= 9 %patch1 -p2 -b .orig %endif @@ -214,6 +214,9 @@ find %{buildroot} -type f -name '*.la' -delete %{_libexecdir}/indicator-loader3 %changelog +* Tue Jul 14 2020 Merlin Mathesius - 12.10.1-18 +- Minor conditional fix for ELN + * Wed Jan 29 2020 Fedora Release Engineering - 12.10.1-17 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 09c84dc86edc884424abecbd6965b492ecbe39a9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jul 2020 04:52:53 +0000 Subject: [PATCH 41/46] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libindicator.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libindicator.spec b/libindicator.spec index 528a0be..7635069 100644 --- a/libindicator.spec +++ b/libindicator.spec @@ -1,6 +1,6 @@ Name: libindicator Version: 12.10.1 -Release: 18%{?dist} +Release: 19%{?dist} Summary: Shared functions for Ayatana indicators License: GPLv3 @@ -214,6 +214,9 @@ find %{buildroot} -type f -name '*.la' -delete %{_libexecdir}/indicator-loader3 %changelog +* Tue Jul 28 2020 Fedora Release Engineering - 12.10.1-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Tue Jul 14 2020 Merlin Mathesius - 12.10.1-18 - Minor conditional fix for ELN From f9164763f42adf77583cd4a16b58356d5561f38a Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Tue, 5 Jan 2021 02:02:32 +0000 Subject: [PATCH 42/46] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- libindicator.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/libindicator.spec b/libindicator.spec index 7635069..882b8b1 100644 --- a/libindicator.spec +++ b/libindicator.spec @@ -19,6 +19,7 @@ BuildRequires: gtk2-devel BuildRequires: gtk3-devel BuildRequires: gnome-common +BuildRequires: make %description A set of symbols and convenience functions that all Ayatana indicators are From b049630ed78109da72ad655851fbd49c151bd4e6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 17:17:52 +0000 Subject: [PATCH 43/46] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libindicator.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libindicator.spec b/libindicator.spec index 882b8b1..88bf9bf 100644 --- a/libindicator.spec +++ b/libindicator.spec @@ -1,6 +1,6 @@ Name: libindicator Version: 12.10.1 -Release: 19%{?dist} +Release: 20%{?dist} Summary: Shared functions for Ayatana indicators License: GPLv3 @@ -215,6 +215,9 @@ find %{buildroot} -type f -name '*.la' -delete %{_libexecdir}/indicator-loader3 %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 12.10.1-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Tue Jul 28 2020 Fedora Release Engineering - 12.10.1-19 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From e6fcda8d8fd6bc0f175252d8d9fc31fcefc60eb5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 11:37:21 +0000 Subject: [PATCH 44/46] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libindicator.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libindicator.spec b/libindicator.spec index 88bf9bf..b4801de 100644 --- a/libindicator.spec +++ b/libindicator.spec @@ -1,6 +1,6 @@ Name: libindicator Version: 12.10.1 -Release: 20%{?dist} +Release: 21%{?dist} Summary: Shared functions for Ayatana indicators License: GPLv3 @@ -215,6 +215,9 @@ find %{buildroot} -type f -name '*.la' -delete %{_libexecdir}/indicator-loader3 %changelog +* Thu Jul 22 2021 Fedora Release Engineering - 12.10.1-21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Tue Jan 26 2021 Fedora Release Engineering - 12.10.1-20 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 41776191a2e59213405067a25b0fdf226eba66b1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 16:28:19 +0000 Subject: [PATCH 45/46] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libindicator.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libindicator.spec b/libindicator.spec index b4801de..51fef19 100644 --- a/libindicator.spec +++ b/libindicator.spec @@ -1,6 +1,6 @@ Name: libindicator Version: 12.10.1 -Release: 21%{?dist} +Release: 22%{?dist} Summary: Shared functions for Ayatana indicators License: GPLv3 @@ -215,6 +215,9 @@ find %{buildroot} -type f -name '*.la' -delete %{_libexecdir}/indicator-loader3 %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 12.10.1-22 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Thu Jul 22 2021 Fedora Release Engineering - 12.10.1-21 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 6afe7218dcf2cb279abbfd630867d36cb2cd9907 Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Mon, 30 Oct 2023 23:08:35 +0300 Subject: [PATCH 46/46] Remove unnecessary files --- sources | 1 - 1 file changed, 1 deletion(-) delete mode 100644 sources diff --git a/sources b/sources deleted file mode 100644 index f9c0036..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -5fd4d6bab339fc9611078b64c44a85a8 libindicator-12.10.1.tar.gz