commit 06b5cbad52286556d9b00e173cdd0aefd505f118
Author: Arkadiusz Miśkiewicz <[email protected]>
Date: Wed May 28 09:09:53 2014 +0200
- up to 12.10.1
libindicate-am.patch | 37 ++++++--
libindicate-doc.patch | 14 +++
libindicate-gir.patch | 259 --------------------------------------------------
libindicate.spec | 40 ++++----
4 files changed, 65 insertions(+), 285 deletions(-)
---
diff --git a/libindicate.spec b/libindicate.spec
index 021816a..d520ca4 100644
--- a/libindicate.spec
+++ b/libindicate.spec
@@ -1,15 +1,17 @@
+# TODO:
+# - python, sharp subpackages
%bcond_without doc
Summary: Libindicate
Summary(pl.UTF-8): Libindicate
Name: libindicate
-Version: 0.2.3
-Release: 8
+Version: 12.10.1
+Release: 1
License: LGPL v2+
Group: Applications
-Source0:
http://launchpad.net/libindicate/0.2/0.2.3/+download/%{name}-%{version}.tar.gz
-# Source0-md5: c32f2cdd85534feea4a5ebd532ede641
+Source0:
https://launchpad.net/libindicate/12.10/%{version}/+download/%{name}-%{version}.tar.gz
+# Source0-md5: aeed68ec8047a3325b4aa4aef38f010a
Patch0: %{name}-am.patch
-Patch1: %{name}-gir.patch
+Patch1: %{name}-doc.patch
URL: https://launchpad.net/libindicate/
BuildRequires: autoconf
BuildRequires: automake
@@ -18,8 +20,9 @@ BuildRequires: glibc-misc
BuildRequires: gnome-common
BuildRequires: gnome-doc-utils
BuildRequires: gobject-introspection-devel
-BuildRequires: gtk+2-devel
+BuildRequires: gtk+3-devel
BuildRequires: gtk-doc-automake
+BuildRequires: libdbusmenu-devel
BuildRequires: libtool
BuildRequires: libxml2-devel
BuildRequires: pkgconfig
@@ -76,7 +79,7 @@ Dokumentacja API biblioteki indicate.
%prep
%setup -q
-%patch0 -p0
+%patch0 -p1
%patch1 -p1
%build
@@ -112,27 +115,28 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libindicate.so.3.*.*
-%attr(755,root,root) %ghost %{_libdir}/libindicate.so.3
-%attr(755,root,root) %{_libdir}/libindicate-gtk.so.1.*.*
-%attr(755,root,root) %ghost %{_libdir}/libindicate-gtk.so.1
+%attr(755,root,root) %{_libdir}/libindicate.so.5.*.*
+%attr(755,root,root) %ghost %{_libdir}/libindicate.so.5
+%attr(755,root,root) %{_libdir}/libindicate-gtk3.so.3.*.*
+%attr(755,root,root) %ghost %{_libdir}/libindicate-gtk3.so.3
%{_libdir}/girepository-1.0/Indicate-*.typelib
-%{_libdir}/girepository-1.0/IndicateGtk-*.typelib
+%{_libdir}/girepository-1.0/IndicateGtk3-*.typelib
%files devel
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libindicate.so
-%attr(755,root,root) %{_libdir}/libindicate-gtk.so
-%{_pkgconfigdir}/indicate.pc
-%{_pkgconfigdir}/indicate-gtk.pc
-%{_includedir}/libindicate-0.2
+%attr(755,root,root) %{_libdir}/libindicate-gtk3.so
+%{_pkgconfigdir}/indicate-0.7.pc
+%{_pkgconfigdir}/indicate-gtk3-0.7.pc
+%{_includedir}/libindicate-0.7
+%{_includedir}/libindicate-gtk3-0.7
%{_datadir}/gir-1.0/Indicate-*.gir
-%{_datadir}/gir-1.0/IndicateGtk-*.gir
+%{_datadir}/gir-1.0/IndicateGtk3-*.gir
%files static
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libindicate.a
-%attr(755,root,root) %{_libdir}/libindicate-gtk.a
+%attr(755,root,root) %{_libdir}/libindicate-gtk3.a
%if %{with doc}
%files apidocs
diff --git a/libindicate-am.patch b/libindicate-am.patch
index 5de6b5a..134fc97 100644
--- a/libindicate-am.patch
+++ b/libindicate-am.patch
@@ -1,11 +1,32 @@
---- Makefile.am.orig 2009-12-05 01:08:43.971618811 +0100
-+++ Makefile.am 2009-12-05 01:09:03.653619602 +0100
-@@ -2,8 +2,6 @@
- SUBDIRS = \
+--- libindicate-12.10.1/Makefile.am~ 2012-07-11 19:59:02.000000000 +0200
++++ libindicate-12.10.1/Makefile.am 2014-05-28 08:37:30.114776500 +0200
+@@ -12,7 +12,6 @@
libindicate \
- libindicate-gtk \
+ $(LIBINDICATEGTK_SUBDIR) \
+ bindings \
- examples \
-- tests \
- docs
+ $(DOC_SUBDIR)
- EXTRA_DIST = \
+ if WANT_TESTS
+--- libindicate-12.10.1/configure.ac~ 2012-08-22 06:52:22.000000000 +0200
++++ libindicate-12.10.1/configure.ac 2014-05-28 08:53:09.540327973 +0200
+@@ -227,7 +227,7 @@
+ AC_MSG_RESULT($PYGTK_DEFSDIR)
+
+ AC_MSG_CHECKING(for pygtk codegen)
+-PYGTK_CODEGEN="$PYTHON `$PKG_CONFIG --variable=codegendir
pygtk-2.0`/codegen.py"
++PYGTK_CODEGEN="$PYTHON `$PKG_CONFIG --variable=codegendir
pygtk-2.0`/codegen.pyc"
+ AC_SUBST(PYGTK_CODEGEN)
+ AC_MSG_RESULT($PYGTK_CODEGEN)
+ ])
+--- libindicate-12.10.1/configure.ac~ 2014-05-28 08:53:35.000000000 +0200
++++ libindicate-12.10.1/configure.ac 2014-05-28 08:56:46.084420978 +0200
+@@ -216,7 +216,7 @@
+ )
+
+ # libpyglib-2.0-python* doesn't have a pkgconfig unfortunately
+-INDICATE_PYTHON_LIBS+=" -lpyglib-2.0-python$PYTHON_VERSION"
++INDICATE_PYTHON_LIBS+=" -lpyglib-2.0-python"
+
+ AC_SUBST(INDICATE_PYTHON_CFLAGS)
+ AC_SUBST(INDICATE_PYTHON_LIBS)
diff --git a/libindicate-doc.patch b/libindicate-doc.patch
new file mode 100644
index 0000000..3d27af4
--- /dev/null
+++ b/libindicate-doc.patch
@@ -0,0 +1,14 @@
+--- libindicate-12.10.1/docs/reference/libindicate-docs.sgml~ 2012-07-11
19:59:02.000000000 +0200
++++ libindicate-12.10.1/docs/reference/libindicate-docs.sgml 2014-05-28
09:02:41.746617079 +0200
+@@ -13,11 +13,6 @@
+ <xi:include href="xml/server.xml" />
+ </part>
+
+-<part id="subclass">
+- <title>Subclasses for specific indicators</title>
+- <xi:include href="xml/indicator-message.xml" />
+-</part>
+-
+ <part id="listeners">
+ <title>Classes for Listeners</title>
+ <xi:include href="xml/listener.xml" />
diff --git a/libindicate-gir.patch b/libindicate-gir.patch
deleted file mode 100644
index 08b9b98..0000000
--- a/libindicate-gir.patch
+++ /dev/null
@@ -1,259 +0,0 @@
---- libindicate-0.2.3/configure.ac.wiget 2009-10-01 21:52:53.000000000
+0200
-+++ libindicate-0.2.3/configure.ac 2009-12-07 20:30:38.000000000 +0100
-@@ -75,29 +75,7 @@ AC_SUBST(LIBINDICATEGTK_LIBS)
- # GObject Introspection
- ###########################
-
--AC_ARG_ENABLE(gobject-introspection,
AC_HELP_STRING([--enable-gobject-introspection], [enable building the
gobject-introspection files]), [enable_gir=$enableval], [enable_gir=yes])
--
--if test "x$enable_gir" = "xyes"; then
-- PKG_CHECK_MODULES(GOBJECT_INTROSPECTION, [gobject-introspection-1.0 >=
0.6], gir_ok=yes, gir_ok=no)
--
-- if test "x$gir_ok" = "xyes"; then
-- G_IR_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner
gobject-introspection-1.0`
-- AC_SUBST(G_IR_SCANNER)
-- G_IR_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler
gobject-introspection-1.0`
-- AC_SUBST(G_IR_COMPILER)
-- G_IR_GENERATE=`$PKG_CONFIG --variable=g_ir_generate
gobject-introspection-1.0`
-- AC_SUBST(G_IR_GENERATE)
--
-- GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
-- AC_SUBST(GIRDIR)
-- TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir
gobject-introspection-1.0)"
-- AC_SUBST(TYPELIBDIR)
-- fi
--else
-- gir_ok=no
--fi
--
--AM_CONDITIONAL(USE_GIR, test "x$gir_ok" = "xyes")
-+GOBJECT_INTROSPECTION_CHECK([0.6.3])
-
- ###########################
- # GTK Doc
-@@ -178,5 +156,5 @@ AC_MSG_NOTICE([
- Libindicate Configuration:
-
- Prefix: $prefix
-- GObject Introspection: $gir_ok
-+ GObject Introspection: $enable_introspection
- ])
---- libindicate-0.2.3/m4/introspection.m4.wiget 2009-12-07
20:30:38.000000000 +0100
-+++ libindicate-0.2.3/m4/introspection.m4 2009-12-07 20:30:38.000000000
+0100
-@@ -0,0 +1,88 @@
-+dnl -*- mode: autoconf -*-
-+dnl Copyright 2009 Johan Dahlin
-+dnl
-+dnl This file is free software; the author(s) gives unlimited
-+dnl permission to copy and/or distribute it, with or without
-+dnl modifications, as long as this notice is preserved.
-+dnl
-+
-+# serial 1
-+
-+m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL],
-+[
-+ AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
-+ AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
-+ AC_BEFORE([LT_INIT],[$0])dnl setup libtool first
-+
-+ dnl enable/disable introspection
-+ m4_if([$2], [require],
-+ [dnl
-+ enable_introspection=yes
-+ ],[dnl
-+ AC_ARG_ENABLE(introspection,
-+
AS_HELP_STRING([--enable-introspection[=@<:@no/auto/yes@:>@]],
-+ [Enable introspection for this build]),,
-+ [enable_introspection=auto])
-+ ])dnl
-+
-+ AC_MSG_CHECKING([for gobject-introspection])
-+
-+ dnl presence/version checking
-+ AS_CASE([$enable_introspection],
-+ [no], [dnl
-+ found_introspection="no (disabled, use --enable-introspection to
enable)"
-+ ],dnl
-+ [yes],[dnl
-+ PKG_CHECK_EXISTS([gobject-introspection-1.0],,
-+ AC_MSG_ERROR([gobject-introspection-1.0 is not
installed]))
-+ PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1],
-+ found_introspection=yes,
-+ AC_MSG_ERROR([You need to have gobject-introspection
>= $1 installed to build AC_PACKAGE_NAME]))
-+ ],dnl
-+ [auto],[dnl
-+ PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1],
found_introspection=yes, found_introspection=no)
-+ ],dnl
-+ [dnl
-+ AC_MSG_ERROR([invalid argument passed to --enable-introspection,
should be one of @<:@no/auto/yes@:>@])
-+ ])dnl
-+
-+ AC_MSG_RESULT([$found_introspection])
-+
-+ INTROSPECTION_SCANNER=
-+ INTROSPECTION_COMPILER=
-+ INTROSPECTION_GENERATE=
-+ INTROSPECTION_GIRDIR=
-+ INTROSPECTION_TYPELIBDIR=
-+ if test "x$found_introspection" = "xyes"; then
-+ INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner
gobject-introspection-1.0`
-+ INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler
gobject-introspection-1.0`
-+ INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate
gobject-introspection-1.0`
-+ INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir
gobject-introspection-1.0`
-+ INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir
gobject-introspection-1.0)"
-+ fi
-+ AC_SUBST(INTROSPECTION_SCANNER)
-+ AC_SUBST(INTROSPECTION_COMPILER)
-+ AC_SUBST(INTROSPECTION_GENERATE)
-+ AC_SUBST(INTROSPECTION_GIRDIR)
-+ AC_SUBST(INTROSPECTION_TYPELIBDIR)
-+
-+ AM_CONDITIONAL(HAVE_INTROSPECTION, test "x$found_introspection" = "xyes")
-+])
-+
-+
-+dnl Usage:
-+dnl GOBJECT_INTROSPECTION_CHECK([minimum-g-i-version])
-+
-+AC_DEFUN([GOBJECT_INTROSPECTION_CHECK],
-+[
-+ _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1])
-+])
-+
-+dnl Usage:
-+dnl GOBJECT_INTROSPECTION_REQUIRE([minimum-g-i-version])
-+
-+
-+AC_DEFUN([GOBJECT_INTROSPECTION_REQUIRE],
-+[
-+ _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1], [require])
-+])
---- libindicate-0.2.3/libindicate-gtk/Makefile.am.wiget 2009-09-04
20:59:32.000000000 +0200
-+++ libindicate-0.2.3/libindicate-gtk/Makefile.am 2009-12-07
20:32:36.000000000 +0100
-@@ -38,35 +38,45 @@ libindicate_gtk_la_LIBADD = \
- pkgconfig_DATA = indicate-gtk.pc
- pkgconfigdir = $(libdir)/pkgconfig
-
--if USE_GIR
-+CLEANFILES =
-
--gobjectintrospection_gir_DATA = \
-- Indicate-gtk-0.1.gir
--gobjectintrospection_girdir = $(datadir)/gir
--
--gobjectintrospection_type_DATA = \
-- Indicate-gtk-0.1.typelib
--gobjectintrospection_typedir = $(libdir)/girepository
--
--irscanner_headers = $(patsubst %,$(srcdir)/%,$(indicate_headers))
--Indicate-gtk-0.1.gir: $(irscanner_headers)
-- $(G_IR_SCANNER) \
-+if HAVE_INTROSPECTION
-+
-+BUILT_GIRSOURCES =
-+
-+irscanner_headers = $(patsubst %,$(srcdir)/%,$(indicate_gtk_headers))
-+
-+IndicateGtk-0.2.gir: $(INTROSPECTION_SCANNER) $(irscanner_headers) Makefile.am
-+ $(INTROSPECTION_SCANNER) \
- -v --namespace IndicateGtk \
-- --nsversion=0.1 \
-+ --nsversion=0.2 \
- --add-include-path=$(srcdir) \
- --include=GObject-2.0 \
- --include=GLib-2.0 \
- --include=GdkPixbuf-2.0 \
-- --library=indicate --pkg indicate \
-- --output Indicate-gtk-0.1.gir $(irscanner_headers)
-+ --include=Indicate-0.2 \
-+ --add-include-path=$(top_builddir)/libindicate \
-+ -I $(top_srcdir) -L $(top_builddir)/libindicate \
-+ --libtool="$(LIBTOOL)" \
-+ --library=indicate-gtk --pkg indicate-gtk \
-+ --output IndicateGtk-0.2.gir $(irscanner_headers)
-+
-+BUILT_GIRSOURCES += IndicateGtk-0.2.gir
-+
-+girdir = $(datadir)/gir-1.0
-+gir_DATA = $(BUILT_GIRSOURCES)
-+
-+typelibsdir = $(libdir)/girepository-1.0
-+typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
-+
-+%.typelib: %.gir $(INTROSPECTION_COMPILER)
-+ $(INTROSPECTION_COMPILER) \
-+ --includedir=$(srcdir) \
-+ --includedir=. \
-+ --includedir=$(top_builddir)/libindicate \
-+ $(INTROSPECTION_COMPILER_OPTS) \
-+ $< -o $(@F)
-
--Indicate-gtk-0.1.typelib: Indicate-gtk-0.1.gir
-- $(G_IR_COMPILER) \
-- --includedir=$(srcdir) Indicate-gtk-0.1.gir \
-- -o Indicate-gtk-0.1.typelib
--
--DISTCLEANFILES = \
-- Indicate-gtk-0.1.gir \
-- Indicate-gtk-0.1.typelib
-+CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA)
-
- endif
---- libindicate-0.2.3/libindicate/Makefile.am.wiget 2009-09-04
20:59:32.000000000 +0200
-+++ libindicate-0.2.3/libindicate/Makefile.am 2009-12-07 20:30:38.000000000
+0100
-@@ -152,19 +152,14 @@ CLEANFILES = \
- s-enum-types-c \
- s-enum-types-h
-
--if USE_GIR
-+if HAVE_INTROSPECTION
-
--gobjectintrospection_gir_DATA = \
-- Indicate-0.2.gir
--gobjectintrospection_girdir = $(datadir)/gir
--
--gobjectintrospection_type_DATA = \
-- Indicate-0.2.typelib
--gobjectintrospection_typedir = $(libdir)/girepository
-+BUILT_GIRSOURCES =
-
- irscanner_headers = $(patsubst %,$(srcdir)/%,$(indicate_headers))
--Indicate-0.2.gir: $(irscanner_headers) Makefile
-- $(G_IR_SCANNER) \
-+
-+Indicate-0.2.gir: $(INTROSPECTION_SCANNER) $(irscanner_headers) Makefile.am
-+ $(INTROSPECTION_SCANNER) \
- -v --namespace Indicate \
- --nsversion=0.2 \
- --add-include-path=$(srcdir) \
-@@ -174,13 +169,21 @@ Indicate-0.2.gir: $(irscanner_headers) M
- --library=indicate --pkg indicate \
- --output Indicate-0.2.gir $(irscanner_headers)
-
--Indicate-0.2.typelib: Indicate-0.2.gir
-- $(G_IR_COMPILER) \
-- --includedir=$(srcdir) Indicate-0.2.gir \
-- -o Indicate-0.2.typelib
--
--DISTCLEANFILES = \
-- Indicate-0.2.gir \
-- Indicate-0.2.typelib
-+BUILT_GIRSOURCES += Indicate-0.2.gir
-+
-+girdir = $(datadir)/gir-1.0
-+gir_DATA = $(BUILT_GIRSOURCES)
-+
-+typelibsdir = $(libdir)/girepository-1.0
-+typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
-+
-+%.typelib: %.gir $(INTROSPECTION_COMPILER)
-+ $(INTROSPECTION_COMPILER) \
-+ --includedir=$(srcdir) \
-+ --includedir=. \
-+ $(INTROSPECTION_COMPILER_OPTS) \
-+ $< -o $(@F)
-+
-+CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA)
-
- endif
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/libindicate.git/commitdiff/06b5cbad52286556d9b00e173cdd0aefd505f118
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
