diff --git a/.gitignore b/.gitignore index e28e02c..f565447 100644 --- a/.gitignore +++ b/.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 diff --git a/.libindicator.metadata b/.libindicator.metadata new file mode 100644 index 0000000..4816dac --- /dev/null +++ b/.libindicator.metadata @@ -0,0 +1 @@ +25c8a0a150651ee6b2198df3f36fcbb49f0295c2 SOURCES/libindicator-12.10.1.tar.gz diff --git a/libindicator-12.10.1-glib262-g_define_type_with_private.patch b/SOURCES/libindicator-12.10.1-glib262-g_define_type_with_private.patch similarity index 100% rename from libindicator-12.10.1-glib262-g_define_type_with_private.patch rename to SOURCES/libindicator-12.10.1-glib262-g_define_type_with_private.patch diff --git a/libindicator.spec b/SPECS/libindicator.spec similarity index 78% rename from libindicator.spec rename to SPECS/libindicator.spec index 51fef19..4a47d4d 100644 --- a/libindicator.spec +++ b/SPECS/libindicator.spec @@ -1,52 +1,52 @@ 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 +BuildRequires: make %description A set of symbols and convenience functions that all Ayatana indicators are likely to use. -%package devel +%package devel Summary: Development files for %{name} 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 tools +%package tools Summary: Shared functions for Ayatana indicators - Tools Requires: %{name}%{?_isa} = %{version}-%{release} Requires: pkgconfig -%description tools +%description tools This package contains tools used by the %{name} package, the Ayatana indicators system. -%package gtk3 +%package gtk3 Summary: GTK+3 build of %{name} %description gtk3 @@ -55,24 +55,24 @@ are likely to use. This is the GTK+ 3 build of %{name}, for use by GTK+ 3 apps. -%package gtk3-devel +%package gtk3-devel Summary: Development files for %{name}-gtk3 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 +%package gtk3-tools Summary: Shared functions for Ayatana indicators - GTK3 Tools Requires: %{name}-gtk3%{?_isa} = %{version}-%{release} Requires: pkgconfig -%description gtk3-tools +%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}. @@ -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,62 +106,63 @@ 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 -( - PKG_CONFIG_PATH=%{buildroot}%{_libdir}/pkgconfig - export PKG_CONFIG_PATH - for var in \ - iconsdir \ - indicatordir \ - %{nil} - do - vardir=$(pkg-config --variable=${var} indicator3-0.4) - mkdir -p %{buildroot}${vardir} - done -) +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 \ + iconsdir \ + indicatordir \ + %{nil} +do + 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,16 +198,21 @@ find %{buildroot} -type f -name '*.la' -delete %files gtk3 -%doc AUTHORS COPYING NEWS ChangeLog -%{_libdir}/libindicator3.so.* -%dir %{_datadir}/libindicator/ -%dir %{_datadir}/libindicator/icons/ +%doc AUTHORS +%license COPYING +%doc NEWS +%doc ChangeLog + +%{_libdir}/libindicator3.so.7{,.*} +%dir %{_datadir}/libindicator/ +%dir %{_datadir}/libindicator/icons/ %{_libdir}/indicators3/ %files gtk3-devel -%dir %{_includedir}/libindicator3-0.4/ -%dir %{_includedir}/libindicator3-0.4/libindicator/ +%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 - 12.10.1-26 +- Rebuilt for MSVSphere 10 + +* Mon Jan 1 2024 Mamoru TASAKA - 12.10.1-26 +- SPDX migration + +* Thu Jul 20 2023 Fedora Release Engineering - 12.10.1-25 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Thu Jan 19 2023 Fedora Release Engineering - 12.10.1-24 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Thu Jul 21 2022 Fedora Release Engineering - 12.10.1-23 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Thu Jan 20 2022 Fedora Release Engineering - 12.10.1-22 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild 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