import libindicator-12.10.1-26.el10

.gitignore

@@ -1,6 +1 @@
-/libindicator-0.3.15.tar.gz
-/libindicator-0.3.17.tar.gz
-/libindicator-0.3.20.tar.gz
-/libindicator-0.3.22.tar.gz
-/libindicator-0.4.94.tar.gz
-/libindicator-12.10.1.tar.gz
+SOURCES/libindicator-12.10.1.tar.gz

.libindicator.metadata

@@ -0,0 +1 @@
+25c8a0a150651ee6b2198df3f36fcbb49f0295c2  SOURCES/libindicator-12.10.1.tar.gz

SPECS/libindicator.spec

@@ -1,22 +1,22 @@
 Name:		libindicator
 Version:	12.10.1
-Release:	22%{?dist}
+Release:	26%{?dist}
 Summary:	Shared functions for Ayatana indicators
 
-License:	GPLv3
+# SPDX confirmed
+License:	GPL-3.0-only
 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
 BuildRequires:	libtool
-BuildRequires:	pkgconfig
 
 BuildRequires:	dbus-glib-devel
-BuildRequires:	gtk2-devel
-BuildRequires:	gtk3-devel
+BuildRequires:	pkgconfig(gtk+-2.0)
+BuildRequires:	pkgconfig(gtk+-3.0)
+BuildRequires:	pkgconfig(gmodule-2.0)
 
 BuildRequires:	gnome-common
 BuildRequires:	make
@@ -80,9 +80,7 @@ tools for the GTK+3 build of %{name}.
 
 %prep
 %setup -q
-%if 0%{?fedora} >= 31 || 0%{?rhel} >= 9
-%patch1 -p2 -b .orig
-%endif
+%patch -P1 -p2 -b .orig
 
 sed -i.addvar configure.ac \
 	-e '\@LIBINDICATOR_LIBS@s|\$LIBM| \$LIBM|'
@@ -108,49 +106,49 @@ NOCONFIGURE=1 \
 
 %build
 %global _configure ../configure
-rm -rf build-gtk2 build-gtk3
-mkdir build-gtk2 build-gtk3
 
-pushd build-gtk2
-export CFLAGS="%{optflags} -Wno-error=deprecated-declarations"
-%configure --with-gtk=2 --disable-static --disable-silent-rules
-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
+build() {
+gtkver=$1
+
+rm -rf build-gtk${gtkver}
+mkdir build-gtk${gtkver}
+pushd build-gtk${gtkver}
 
-pushd build-gtk3
 export CFLAGS="%{optflags} -Wno-error=deprecated-declarations"
-%configure --with-gtk=3 --disable-static --disable-silent-rules
-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}
+
+%configure \
+	--with-gtk=${gtkver} \
+	--disable-static \
+	--disable-silent-rules \
+	%{nil}
+
+sed -i libtool -e 's! -shared ! -Wl,--as-needed\0!g'
+sed -i libtool -e 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g'
+sed -i libtool -e 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g'
+
+%make_build
 popd
 
+}
+
+build 2
+build 3
+
 
 %install
-pushd build-gtk2
-make install DESTDIR=%{buildroot}
-popd
-(
-	PKG_CONFIG_PATH=%{buildroot}%{_libdir}/pkgconfig
-	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}
+install() {
+gtkver=$1
+
+pushd build-gtk${gtkver}
+%make_install
 popd
-(
+
+INDICATOR_PKGCONF_NAME=indicator-0.4
+if [ $gtkver == 3 ] ; then
+	INDICATOR_PKGCONF_NAME=indicator3-0.4
+fi
+
 PKG_CONFIG_PATH=%{buildroot}%{_libdir}/pkgconfig
 export PKG_CONFIG_PATH
 for var in \
@@ -158,12 +156,13 @@ popd
 	indicatordir \
 	%{nil}
 do
-		vardir=$(pkg-config --variable=${var} indicator3-0.4)
+	vardir=$(pkg-config --variable=${var} ${INDICATOR_PKGCONF_NAME})
 	mkdir -p %{buildroot}${vardir}
 done
-)
-
+}
 
+install 2
+install 3
 
 # Ubuntu doesn't package the dummy indicator
 rm -f %{buildroot}%{_libdir}/libdummy-indicator*.so
@@ -176,8 +175,11 @@ find %{buildroot} -type f -name '*.la' -delete
 
 
 %files
-%doc AUTHORS COPYING NEWS ChangeLog
-%{_libdir}/libindicator.so.*
+%doc	AUTHORS
+%license	COPYING
+%doc	NEWS
+%doc	ChangeLog
+%{_libdir}/libindicator.so.7{,.*}
 %dir %{_datadir}/libindicator/
 %dir %{_datadir}/libindicator/icons/
 %{_libdir}/indicators/
@@ -196,8 +198,12 @@ find %{buildroot} -type f -name '*.la' -delete
 
 
 %files gtk3
-%doc AUTHORS COPYING NEWS ChangeLog
-%{_libdir}/libindicator3.so.*
+%doc	AUTHORS
+%license	COPYING
+%doc	NEWS
+%doc	ChangeLog
+
+%{_libdir}/libindicator3.so.7{,.*}
 %dir	%{_datadir}/libindicator/
 %dir	%{_datadir}/libindicator/icons/
 %{_libdir}/indicators3/
@@ -206,6 +212,7 @@ find %{buildroot} -type f -name '*.la' -delete
 %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
@@ -215,6 +222,21 @@ find %{buildroot} -type f -name '*.la' -delete
 %{_libexecdir}/indicator-loader3
 
 %changelog
+* Mon Dec 23 2024 Arkady L. Shane <tigro@msvsphere-os.ru> - 12.10.1-26
+- Rebuilt for MSVSphere 10
+
+* Mon Jan  1 2024 Mamoru TASAKA <mtasaka@fedoraproject.org> - 12.10.1-26
+- SPDX migration
+
+* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 12.10.1-25
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 12.10.1-24
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 12.10.1-23
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
 * Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 12.10.1-22
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
 

sources

@@ -1 +0,0 @@
-5fd4d6bab339fc9611078b64c44a85a8  libindicator-12.10.1.tar.gz