rpms/libopensync-plugin-synce/FC-6 libopensync-plugin-synce-autotools.patch, NONE, 1.1 libopensync-plugin-synce.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Andreas Bierfert (awjb) fedora-extras-commits at redhat.com
Thu Jul 26 17:11:36 UTC 2007


Author: awjb

Update of /cvs/pkgs/rpms/libopensync-plugin-synce/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10461/FC-6

Modified Files:
	.cvsignore sources 
Added Files:
	libopensync-plugin-synce-autotools.patch 
	libopensync-plugin-synce.spec 
Log Message:
- add fc6, f-7
- fix spec


libopensync-plugin-synce-autotools.patch:

--- NEW FILE libopensync-plugin-synce-autotools.patch ---
--- configure.in.orig	2007-07-20 09:30:28.000000000 +0200
+++ configure.in	2007-07-20 09:32:05.000000000 +0200
@@ -15,8 +15,19 @@
 dnl AM_PATH_RRA forgets to add mimedir to the list of dependicies.
 dnl Fix it here. 
 LIBS="-lmimedir $LIBS"
-AM_PATH_RRA
-AM_PATH_LIBSYNCE
+dnl AM_PATH_RRA
+dnl AM_PATH_LIBSYNCE
+PKG_CHECK_MODULES(LIBRRA, [librra])
+AC_SUBST(LIBRRA_CFLAGS)
+AC_SUBST(LIBRRA_LIBS)
+
+PKG_CHECK_MODULES(LIBSYNCE, [libsynce])
+AC_SUBST(LIBSYNCE_CFLAGS)
+AC_SUBST(LIBSYNCE_LIBS)
+
+PKG_CHECK_MODULES(LIBRAPI2, [librapi2])
+AC_SUBST(LIBRAPI2_CFLAGS)
+AC_SUBST(LIBRAPI2_LIBS)
 
 AC_ISC_POSIX
 AC_PROG_CC
--- src/Makefile.am.orig	2007-07-20 09:32:53.000000000 +0200
+++ src/Makefile.am	2007-07-20 09:26:30.000000000 +0200
@@ -2,7 +2,8 @@
 configdir=@OPENSYNC_CONFIGDIR@
 formatsdir=@OPENSYNC_FORMATSDIR@
 
-AM_CFLAGS = -Wall -Werror @PACKAGE_CFLAGS@
+AM_CFLAGS = -Wall -Werror @PACKAGE_CFLAGS@ $(LIBSYNCE_CFLAGS) \
+$(LIBRRA_CFLAGS) $(LIBRAPI2_CFLAGS)
 
 EXTRA_DIST = synce-plugin
 
@@ -18,10 +19,13 @@
 	synce_file.h
 
 synce_plugin_la_LDFLAGS = -avoid-version -export-dynamic -module
-synce_plugin_la_LIBADD = @PACKAGE_LIBS@ @LIBS@ -lrapi -lsynce -lrra
+synce_plugin_la_LIBADD = @PACKAGE_LIBS@ @LIBS@ $(LIBSYNCE_LIBS) $(LIBRRA_LIBS) $(LIBRAPI2_LIBS)
+synce_plugin_la_CFLAGS = @PACKAGE_CFLAGS@ $(LIBSYNCE_CFLAGS) \
+$(LIBRRA_CFLAGS) $(LIBRAPI2_CFLAGS)
 
 noinst_PROGRAMS = ft
 
 ft_SOURCES=	synce_file.c synce_file.h
-ft_CFLAGS = -DTEST_FILE -Wall -Werror @PACKAGE_CFLAGS@
-ft_LDADD = @PACKAGE_LIBS@ @LIBS@ -lrapi -lsynce -lrra
+ft_CFLAGS = -DTEST_FILE -Wall -Werror @PACKAGE_CFLAGS@ $(LIBSYNCE_CFLAGS) \
+$(LIBRRA_CFLAGS) $(LIBRAPI2_CFLAGS)
+ft_LDADD = @PACKAGE_LIBS@ @LIBS@ $(LIBSYNCE_LIBS) $(LIBRRA_LIBS) $(LIBRAPI2_LIBS)


--- NEW FILE libopensync-plugin-synce.spec ---
Name:           libopensync-plugin-synce
Version:        0.22
Release:        2
Summary:        Synce plugin for libopensync

Group:          System Environment/Libraries
License:        GPL
URL:            http://www.opensync.org
# see http://www.opensync.org/wiki/download
Source0:        %{name}-%{version}.tar.bz2
Patch0:         libopensync-plugin-synce-autotools.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  libopensync-devel
BuildRequires:  librra-devel librapi-devel
BuildRequires:  libmimedir-devel
BuildRequires:  automake autoconf libtool

# see 244917
Obsoletes: syncekonnector


%description
%{summary}

%prep
%setup -q
%patch0
autoreconf -f

%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -type f -name *.la -exec rm -f {} \;

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog README
%{_libdir}/opensync/plugins/synce_plugin.so
%{_datadir}/opensync/defaults/synce-plugin


%changelog
* Fri Jul 20 2007 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
- 0.22-2
- add build patch
- add obsoletes as discussed in #244917

* Wed Jun 20 2007 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
- 0.22-1
- version upgrade
- fix BR

* Fri Nov 25 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
0.18-0.770svn
- initial version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libopensync-plugin-synce/FC-6/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Jul 2007 17:39:34 -0000	1.1
+++ .cvsignore	26 Jul 2007 17:11:04 -0000	1.2
@@ -0,0 +1 @@
+libopensync-plugin-synce-0.22.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libopensync-plugin-synce/FC-6/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Jul 2007 17:39:34 -0000	1.1
+++ sources	26 Jul 2007 17:11:04 -0000	1.2
@@ -0,0 +1 @@
+f325b7dd9f273c46e77fb7b337325880  libopensync-plugin-synce-0.22.tar.bz2




More information about the scm-commits mailing list