rpms/synce-trayicon/F-7 synce-trayicon-autotools.patch, NONE, 1.1 synce-trayicon.spec, 1.7, 1.8

[Andreas Bierfert (awjb)]

Author: awjb

Update of /cvs/pkgs/rpms/synce-trayicon/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7817/F-7

Modified Files:
	synce-trayicon.spec 
Added Files:
	synce-trayicon-autotools.patch 
Log Message:
- fix BR
- fix patch (Dave Jones)
- fix #248369


synce-trayicon-autotools.patch:

--- NEW FILE synce-trayicon-autotools.patch ---
--- synce-trayicon-0.9.0/src/Makefile.am.autotools	2004-08-28 13:51:21.000000000 -0400
+++ synce-trayicon-0.9.0/src/Makefile.am	2007-07-16 10:10:23.000000000 -0400
@@ -3,10 +3,14 @@ bin_PROGRAMS = synce-trayicon
 
 INCLUDES  = \
 			$(GNOME2_CFLAGS) 						\
+			${LIBSYNCE_CFLAGS}      \
+			${LIBRAPI2_CFLAGS}      \
 			-DDATADIR=\"$(datadir)\" 				\
 			-DSYNCE_DATA=\""$(datadir)/synce/"\" 
 
 synce_trayicon_SOURCES = eggtrayicon.c synce-trayicon.c gtop_stuff.c properties.c eggtrayicon.h gtop_stuff.h properties.h 
 
-synce_trayicon_LDADD = $(GNOME2_LIBS) 
+synce_trayicon_LDADD = $(GNOME2_LIBS) \
+			$(LIBSYNCE_LIBS) \
+			$(LIBRAPI2_LIBS)
 ##$(LDFLAGS)
--- synce-trayicon-0.9.0/configure.ac.autotools	2004-08-28 14:00:00.000000000 -0400
+++ synce-trayicon-0.9.0/configure.ac	2007-07-16 10:10:23.000000000 -0400
@@ -16,7 +16,15 @@ AC_PROG_LIBTOOL
 AC_PROG_MAKE_SET
 
 dnl Check for librapi2
-AM_PATH_LIBRAPI2
+PKG_CHECK_MODULES(LIBRAPI2, [librapi2])
+AC_SUBST(LIBRAPI2_CFLAGS)
+AC_SUBST(LIBRAPI2_LIBS)
+
+dnl libsynce is needded for librapi2
+PKG_CHECK_MODULES(LIBSYNCE, [libsynce])
+AC_SUBST(LIBSYNCE_CFLAGS)
+AC_SUBST(LIBSYNCE_LIBS)
+
 
 PKG_CHECK_MODULES(GNOME2, 
 				  glib-2.0       \


Index: synce-trayicon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/synce-trayicon/F-7/synce-trayicon.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- synce-trayicon.spec	4 Oct 2006 22:55:00 -0000	1.7
+++ synce-trayicon.spec	5 Dec 2007 05:26:11 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           synce-trayicon
 Version:        0.9.0
-Release:        8%{?dist}
+Release:        11%{?dist}
 Summary:        Tray icon for use with gnome and synce
 
 Group:          Applications/Communications
@@ -8,9 +8,10 @@
 URL:            http://synce.sourceforge.net/
 Source0:        http://dl.sf.net/synce/synce-trayicon-0.9.0.tar.gz
 Source1:        synce-trayicon.desktop
+Patch0:         synce-trayicon-autotools.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  synce-devel
+BuildRequires:  librapi-devel
 BuildRequires:  libgnomeui-devel
 BuildRequires:  libgtop2-devel
 BuildRequires:  libxml2-devel
@@ -18,13 +19,20 @@
 BuildRequires:  desktop-file-utils
 BuildRequires:  perl-XML-Parser
 BuildRequires:  gettext
+BuildRequires:  glib-devel
+BuildRequires:  automake autoconf libtool intltool
 
 %description
 %{summary}
 
 %prep
 %setup -q
+%patch0 -p1
 
+touch NEWS
+aclocal
+automake --add-missing
+autoreconf
 
 %build
 %configure --disable-static
@@ -55,6 +63,18 @@
 %{_datadir}/applications/*
 
 %changelog
+* Tue Dec 04 2007 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 0.9.0-11
+- fix BR
+
+* Fri Aug 10 2007 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 0.9.0-10
+- fix patch (Dave Jones)
+
+* Fri Jul 20 2007 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 0.9.0-9
+- fix #248369
+
 * Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.9.0-8
  - rebuilt for unwind info generation, broken in gcc-4.1.1-21