From 091a529da0e4e9b27077f7677f9fcf8c8837fbad Mon Sep 17 00:00:00 2001 From: Eduardo Echeverria Date: Fri, 31 May 2013 01:09:10 -0430 Subject: [PATCH] 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