rpms/libopensync/devel libopensync-32.conf, NONE, 1.1 libopensync-64.conf, NONE, 1.1 libopensync-rpath.patch, NONE, 1.1 libopensync.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Andreas Bierfert (awjb) fedora-extras-commits at redhat.com
Sun Dec 11 21:58:46 UTC 2005 

Author: awjb

Update of /cvs/extras/rpms/libopensync/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31124/devel

Modified Files:
	.cvsignore sources 
Added Files:
	libopensync-32.conf libopensync-64.conf 
	libopensync-rpath.patch libopensync.spec 
Log Message:
auto-import libopensync-0.18-3 on branch devel from libopensync-0.18-3.src.rpm


--- NEW FILE libopensync-32.conf ---
/usr/lib/opensync/
/usr/lib/opensync/formats/
/usr/lib/opensync/plugins/


--- NEW FILE libopensync-64.conf ---
/usr/lib64/opensync/
/usr/lib64/opensync/formats/
/usr/lib64/opensync/plugins/

libopensync-rpath.patch:

--- NEW FILE libopensync-rpath.patch ---
--- tools/Makefile.am.orig	2005-11-29 15:05:27.000000000 +0100
+++ tools/Makefile.am	2005-11-29 15:05:04.000000000 +0100
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-AM_CFLAGS = -Wall -Werror @GCOV_CFLAGS@
+AM_CFLAGS = -Wall @GCOV_CFLAGS@
 
 INCLUDES = -I$(top_srcdir) @PACKAGE_CFLAGS@ @XML_CFLAGS@ -I$(top_srcdir)/osengine
 
@@ -9,23 +9,23 @@
 endif
 
 osyncdump_SOURCES = osyncdump.c
-osyncdump_LDFLAGS = @PACKAGE_LIBS@ @XML_LIBS@ -R $(libdir) @GCOV_LDFLAGS@
+osyncdump_LDFLAGS = @PACKAGE_LIBS@ @XML_LIBS@ @GCOV_LDFLAGS@
 osyncdump_LDADD = $(top_builddir)/opensync/libopensync.la
 
 osyncstress_SOURCES = osyncstress.c
-osyncstress_LDFLAGS = @PACKAGE_LIBS@ -R $(libdir) @GCOV_LDFLAGS@
+osyncstress_LDFLAGS = @PACKAGE_LIBS@ @GCOV_LDFLAGS@
 osyncstress_LDADD = $(top_builddir)/osengine/libosengine.la $(top_builddir)/opensync/libopensync.la
 
 osyncplugin_SOURCES = osyncplugin.c
-osyncplugin_LDFLAGS = @PACKAGE_LIBS@ -R $(libdir) @GCOV_LDFLAGS@
+osyncplugin_LDFLAGS = @PACKAGE_LIBS@ @GCOV_LDFLAGS@
 osyncplugin_LDADD = $(top_builddir)/opensync/libopensync.la
 
 osynctest_SOURCES = osynctest.c
-osynctest_LDFLAGS = @PACKAGE_LIBS@ -R $(libdir) @GCOV_LDFLAGS@
+osynctest_LDFLAGS = @PACKAGE_LIBS@ @GCOV_LDFLAGS@
 osynctest_LDADD = $(top_builddir)/osengine/libosengine.la $(top_builddir)/opensync/libopensync.la
 
 osyncbinary_SOURCES = osyncbinary.c
-osyncbinary_LDFLAGS = @PACKAGE_LIBS@ -R $(libdir)
+osyncbinary_LDFLAGS = @PACKAGE_LIBS@
 osyncbinary_LDADD = $(top_builddir)/opensync/libopensync.la
 
 CLEANFILES = \
--- osengine/Makefile.am.orig	2005-11-29 15:10:14.000000000 +0100
+++ osengine/Makefile.am	2005-11-29 15:12:13.000000000 +0100
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-AM_CFLAGS = -Werror -Wall @GCOV_CFLAGS@
+AM_CFLAGS = -Wall @GCOV_CFLAGS@
 
 INCLUDES = -I$(top_srcdir) @PACKAGE_CFLAGS@ 
 
@@ -47,5 +47,5 @@
 	*.bbg \
 	*.da
 
-libosengine_la_LDFLAGS = $(PACKAGE_LIBS) -R $(libdir) @GCOV_LDFLAGS@
+libosengine_la_LDFLAGS = $(PACKAGE_LIBS) @GCOV_LDFLAGS@
 libosengine_la_LIBADD = $(top_builddir)/opensync/libopensync.la
--- osengine/Makefile.in.orig	2005-11-29 15:14:18.000000000 +0100
+++ osengine/Makefile.in	2005-11-29 15:20:32.000000000 +0100
@@ -270,7 +270,7 @@
 	*.bbg \
 	*.da
 
-libosengine_la_LDFLAGS = $(PACKAGE_LIBS) -R $(libdir) @GCOV_LDFLAGS@
+libosengine_la_LDFLAGS = $(PACKAGE_LIBS) @GCOV_LDFLAGS@
 libosengine_la_LIBADD = $(top_builddir)/opensync/libopensync.la
 all: all-am
 
--- wrapper/Makefile.am.orig	2005-11-29 15:27:35.000000000 +0100
+++ wrapper/Makefile.am	2005-11-29 15:27:48.000000000 +0100
@@ -22,5 +22,5 @@
 endif
 
 nodist__opensync_la_SOURCES = opensync_wrap.c
-_opensync_la_LDFLAGS = @PACKAGE_LIBS@ @XML_LIBS@ $(PYTHON_LDFLAGS) -R $(libdir) -module
+_opensync_la_LDFLAGS = @PACKAGE_LIBS@ @XML_LIBS@ $(PYTHON_LDFLAGS) -module
 _opensync_la_LIBADD = $(top_builddir)/opensync/libopensync.la
--- wrapper/Makefile.in.orig	2005-11-29 15:30:22.000000000 +0100
+++ wrapper/Makefile.in	2005-11-29 15:31:52.000000000 +0100
@@ -235,7 +235,7 @@
 @HAVE_PYTHON_TRUE at osbindingsdir = $(pythondir)
 @HAVE_PYTHON_TRUE at osbindings_LTLIBRARIES = _opensync.la
 nodist__opensync_la_SOURCES = opensync_wrap.c
-_opensync_la_LDFLAGS = @PACKAGE_LIBS@ @XML_LIBS@ $(PYTHON_LDFLAGS) -R $(libdir) -module
+_opensync_la_LDFLAGS = @PACKAGE_LIBS@ @XML_LIBS@ $(PYTHON_LDFLAGS) -module
 _opensync_la_LIBADD = $(top_builddir)/opensync/libopensync.la
 all: all-am
 
--- tools/Makefile.in.orig	2005-11-29 15:37:42.000000000 +0100
+++ tools/Makefile.in	2005-11-29 15:38:03.000000000 +0100
@@ -237,19 +237,19 @@
 AM_CFLAGS = -Wall -Werror @GCOV_CFLAGS@
 INCLUDES = -I$(top_srcdir) @PACKAGE_CFLAGS@ @XML_CFLAGS@ -I$(top_srcdir)/osengine
 osyncdump_SOURCES = osyncdump.c
-osyncdump_LDFLAGS = @PACKAGE_LIBS@ @XML_LIBS@ -R $(libdir) @GCOV_LDFLAGS@
+osyncdump_LDFLAGS = @PACKAGE_LIBS@ @XML_LIBS@ @GCOV_LDFLAGS@
 osyncdump_LDADD = $(top_builddir)/opensync/libopensync.la
 osyncstress_SOURCES = osyncstress.c
-osyncstress_LDFLAGS = @PACKAGE_LIBS@ -R $(libdir) @GCOV_LDFLAGS@
+osyncstress_LDFLAGS = @PACKAGE_LIBS@ @GCOV_LDFLAGS@
 osyncstress_LDADD = $(top_builddir)/osengine/libosengine.la $(top_builddir)/opensync/libopensync.la
 osyncplugin_SOURCES = osyncplugin.c
-osyncplugin_LDFLAGS = @PACKAGE_LIBS@ -R $(libdir) @GCOV_LDFLAGS@
+osyncplugin_LDFLAGS = @PACKAGE_LIBS@ @GCOV_LDFLAGS@
 osyncplugin_LDADD = $(top_builddir)/opensync/libopensync.la
 osynctest_SOURCES = osynctest.c
-osynctest_LDFLAGS = @PACKAGE_LIBS@ -R $(libdir) @GCOV_LDFLAGS@
+osynctest_LDFLAGS = @PACKAGE_LIBS@ @GCOV_LDFLAGS@
 osynctest_LDADD = $(top_builddir)/osengine/libosengine.la $(top_builddir)/opensync/libopensync.la
 osyncbinary_SOURCES = osyncbinary.c
-osyncbinary_LDFLAGS = @PACKAGE_LIBS@ -R $(libdir)
+osyncbinary_LDFLAGS = @PACKAGE_LIBS@
 osyncbinary_LDADD = $(top_builddir)/opensync/libopensync.la
 CLEANFILES = \
 	*.bb \


--- NEW FILE libopensync.spec ---
Name:           libopensync
Version:        0.18
Release:        3
Summary:        A synchronization framework

Group:          System Environment/Libraries
License:        LGPL
URL:            http://www.opensync.org/
# see http://www.opensync.org/wiki/download
Source0:        %{name}-%{version}.tar.gz
Source1:        libopensync-32.conf
Source2:        libopensync-64.conf
Patch0:         libopensync-rpath.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  glib2-devel
BuildRequires:  libxml2-devel
BuildRequires:  sqlite-devel
BuildRequires:  zlib-devel
BuildRequires:  python-devel
BuildRequires:  swig
BuildRequires:  pkgconfig

%description
OpenSync is a synchronization framework that is platform and distribution
independent. It consists of several plugins that can be used to connect to
devices, a powerful sync-engine and the framework itself. The synchronization
framework is kept very flexible and is capable of synchronizing any type of
data, including contacts, calendar, tasks, notes and files. 

%package devel
Summary:        Development package for %{name}
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       pkgconfig
Requires:       glib2-devel
Requires:       libxml2-devel
Requires:       zlib-devel
%description    devel
The %{name}-devel package contains the files needed for development
with %{name}.

%prep
%setup -q
%patch0
# some source files are marked executable
for dir in opensync osengine; do
    cd %{_builddir}/%{name}-%{version}/$dir
    chmod -x *
done

%build
%configure --disable-static
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

mkdir -p $RPM_BUILD_ROOT/%{_datadir}/opensync
mkdir -p $RPM_BUILD_ROOT/%{_libdir}/opensync/formats
mkdir -p $RPM_BUILD_ROOT/%{_libdir}/opensync/plugins

find $RPM_BUILD_ROOT -type f -name *.la -exec rm -f {} \;

mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/

%ifarch x86_64
install -p -m644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/
%else
install -p -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/
%endif

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING NEWS README TODO
%{_bindir}/*
%{_libdir}/*.so.*
%dir %{_libdir}/opensync
%dir %{_libdir}/opensync/formats
%dir %{_libdir}/opensync/plugins
%{_libdir}/opensync/formats/*
%{_libdir}/python*/*
%dir %{_datadir}/opensync
%config %{_sysconfdir}/ld.so.conf.d/*

%files devel
%defattr(-,root,root,-)
%dir %{_includedir}/opensync-1.0
%{_includedir}/opensync-1.0/*
%{_libdir}/*.so
%{_libdir}/pkgconfig/*

%changelog
* Sun Dec 11 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
0.18-3
- .c and .h files should not be marked executable

* Sun Dec 04 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
0.18-2
- fix missing BR
- mark ldconf as config

* Sat Nov 12 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
0.18-1
- Version upgrade

* Mon Oct 03 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
0.17-1
- Initial Release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libopensync/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	11 Dec 2005 21:57:39 -0000	1.1
+++ .cvsignore	11 Dec 2005 21:58:44 -0000	1.2
@@ -0,0 +1 @@
+libopensync-0.18.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libopensync/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	11 Dec 2005 21:57:39 -0000	1.1
+++ sources	11 Dec 2005 21:58:44 -0000	1.2
@@ -0,0 +1 @@
+ce94a69fb7ae7533d1f8828b6402cec8  libopensync-0.18.tar.gz

More information about the fedora-extras-commits mailing list