- added sh patch (fix bashism)

- pl, completed dependencies

diff --git a/libindicator-sh.patch b/libindicator-sh.patch
new file mode 100644 (file)
index 0000000..ab69753
--- /dev/null
+++ b/libindicator-sh.patch
@@ -0,0 +1,11 @@
+--- libindicator-12.10.1/configure.ac.orig     2012-09-19 17:38:40.047378393 +0200
++++ libindicator-12.10.1/configure.ac  2013-12-29 10:49:26.640857649 +0100
+@@ -66,7 +66,7 @@
+ AM_CONDITIONAL(USE_GTK3, [test "x$with_gtk" = x3])
+ 
+ LT_LIB_M
+-LIBINDICATOR_LIBS+="$LIBM"
++LIBINDICATOR_LIBS="$LIBINDICATOR_LIBS $LIBM"
+ 
+ ##############################
+ # Custom Junk

diff --git a/libindicator.spec b/libindicator.spec
index 0efe2ba0aab7d9e9bfba222c08842304d15b4f8f..7fab5c73217f100916858160bed80a07b3b790ff 100644 (file)
--- a/libindicator.spec
+++ b/libindicator.spec
@@ -1,57 +1,95 @@
-Summary:       Shared functions for Ayatana indicators
+Summary:       Shared functions for Ayatana indicators (GTK+ 2.x version)
+Summary(pl.UTF-8):     Funkcje współdzielone dla wskaźników Ayatana (wersja dla GTK+ 2.x)
 Name:          libindicator
 Version:       12.10.1
 Release:       1
 License:       GPL v3
 Group:         Libraries
-URL:           https://launchpad.net/libindicator
+#Source0Download: https://launchpad.net/libindicator/+download
 Source0:       http://launchpad.net/libindicator/12.10/%{version}/+download/%{name}-%{version}.tar.gz
 # Source0-md5: 5fd4d6bab339fc9611078b64c44a85a8
-BuildRequires: gtk+2-devel
-BuildRequires: gtk+3-devel
+Patch0:                %{name}-sh.patch
+URL:           https://launchpad.net/libindicator
+BuildRequires: autoconf >= 2.64
+BuildRequires: automake >= 1:1.11
+BuildRequires: glib2-devel >= 1:2.22
+BuildRequires: gtk+2-devel >= 2:2.18
+BuildRequires: gtk+3-devel >= 3.0
+BuildRequires: libtool >= 2:2.2
 BuildRequires: pkgconfig
+BuildRequires: sed >= 4.0
 BuildRequires: which
+Requires:      glib2 >= 1:2.22
+Requires:      gtk+2 >= 2:2.18
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 A set of symbols and convenience functions that all Ayatana indicators
-are likely to use.
+are likely to use. This package contains GTK+ 2.x version.
+
+%description -l pl.UTF-8
+Zbiór symboli i wygodnych funkcji, które mogą być używane przez
+wszystkie wskaźniki Ayatana. Ten pakiet zawiera wersję dla GTK+ 2.x.
 
 %package devel
-Summary:       Development files for %{name}
+Summary:       Development files for libindicator (GTK+ 2.x version)
+Summary(pl.UTF-8):     Pliki programistyczne biblioteki libindicator (wersja dla GTK+ 2.x)
 Group:         Development/Libraries
 Requires:      %{name} = %{version}-%{release}
+Requires:      glib2-devel >= 1:2.22
+Requires:      gtk+2-devel >= 2:2.18
 
 %description devel
-The %{name}-devel package contains libraries and header files for
-developing applications that use %{name}.
+This package contains the header files for developing applications
+that use libindicator (GTK+ 2.x version).
+
+%description devel -l pl.UTF-8
+Ten pakiet zawiera pliki nagłówkowe do tworzenia aplikacji
+wykorzystujących bibliotekę libindicator (w wersji dla GTK+ 2.x).
 
 %package gtk3
-Summary:       GTK+3 build of %{name}
+Summary:       Shared functions for Ayatana indicators (GTK+ 3.x version)
+Summary(pl.UTF-8):     Funkcje współdzielone dla wskaźników Ayatana (wersja dla GTK+ 3.x)
 Group:         Libraries
+Requires:      glib2 >= 1:2.22
+Requires:      gtk+3 >= 3.0
 
 %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.
+are likely to use. This package contains GTK+ 3.x version.
+
+%description gtk3 -l pl.UTF-8
+Zbiór symboli i wygodnych funkcji, które mogą być używane przez
+wszystkie wskaźniki Ayatana. Ten pakiet zawiera wersję dla GTK+ 3.x.
 
 %package gtk3-devel
-Summary:       Development files for %{name}-gtk3
+Summary:       Development files for libindicator (GTK+ 3.x version)
+Summary(pl.UTF-8):     Pliki programistyczne biblioteki libindicator (wersja dla GTK+ 3.x)
 Group:         Development/Libraries
 Requires:      %{name}-gtk3 = %{version}-%{release}
+Requires:      glib2-devel >= 1:2.22
+Requires:      gtk+3-devel >= 3.0
 
 %description gtk3-devel
-The %{name}-gtk3-devel package contains libraries and header files for
-developing applications that use %{name}-gtk3.
+This package contains the header files for developing applications
+that use libindicator (GTK+ 2.x version).
+
+%description gtk3-devel -l pl.UTF-8
+Ten pakiet zawiera pliki nagłówkowe do tworzenia aplikacji
+wykorzystujących bibliotekę libindicator (w wersji dla GTK+ 2.x).
 
 %prep
 %setup -q
+%patch0 -p1
+
 %{__sed} -i -e 's|-Werror||g' */Makefile.am
 
 %build
+%{__libtoolize}
 %{__aclocal}
-%{__automake}
 %{__autoconf}
+%{__autoheader}
+%{__automake}
 # 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
@@ -60,20 +98,21 @@ developing applications that use %{name}-gtk3.
 install -d build-gtk{2,3}
 cd build-gtk2
 ../%configure \
+       --disable-silent-rules \
        --disable-static \
        --with-gtk=2
-%{__make} \
-       V=1
+%{__make}
 
 cd ../build-gtk3
 ../%configure \
+       --disable-silent-rules \
        --disable-static \
        --with-gtk=3
-%{__make} \
-       V=1
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
+
 %{__make} -C build-gtk2 install -j1 \
        DESTDIR=$RPM_BUILD_ROOT
 %{__make} -C build-gtk3 install -j1 \
@@ -94,14 +133,15 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
+%doc AUTHORS ChangeLog NEWS
 %attr(755,root,root) %{_libdir}/libindicator.so.*.*.*
-%ghost %{_libdir}/libindicator.so.7
+%attr(755,root,root) %ghost %{_libdir}/libindicator.so.7
 %attr(755,root,root) %{_libdir}/indicator-loader
 
 %files devel
 %defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libindicator.so
 %{_includedir}/libindicator-0.4
-%{_libdir}/libindicator.so
 %{_pkgconfigdir}/indicator-0.4.pc
 # Contains 80indicator-debugging
 # This is marked as 'for development use only'
@@ -109,12 +149,13 @@ rm -rf $RPM_BUILD_ROOT
 
 %files gtk3
 %defattr(644,root,root,755)
+%doc AUTHORS ChangeLog NEWS
 %attr(755,root,root) %{_libdir}/libindicator3.so.*.*.*
-%ghost %{_libdir}/libindicator3.so.7
+%attr(755,root,root) %ghost %{_libdir}/libindicator3.so.7
 %attr(755,root,root) %{_libdir}/indicator-loader3
 
 %files gtk3-devel
 %defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libindicator3.so
 %{_includedir}/libindicator3-0.4
-%{_libdir}/libindicator3.so
 %{_pkgconfigdir}/indicator3-0.4.pc