rpms/libopensync-plugin-opie/devel PACKAGE-LICENSING, NONE, 1.1 libopensync-plugin-opie-curl-setopt.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 libopensync-plugin-opie.spec, 1.5, 1.6 sources, 1.3, 1.4
Andreas Bierfert
awjb at fedoraproject.org
Fri Mar 27 18:29:55 UTC 2009
- Previous message: rpms/libselinux/devel libselinux-rhat.patch, 1.186, 1.187 libselinux.spec, 1.363, 1.364
- Next message: rpms/libselinux/F-10 .cvsignore, 1.176, 1.177 libselinux-rhat.patch, 1.172, 1.173 libselinux.spec, 1.348, 1.349 sources, 1.180, 1.181
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: awjb
Update of /cvs/pkgs/rpms/libopensync-plugin-opie/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18170
Modified Files:
.cvsignore libopensync-plugin-opie.spec sources
Added Files:
PACKAGE-LICENSING libopensync-plugin-opie-curl-setopt.patch
Log Message:
- downgrade
--- NEW FILE PACKAGE-LICENSING ---
= Source files GPLv2 =
src/opie_comms.{c,h}
src/opie_debug.h
src/opie_qcop.{c,h}
src/opie-sync
= Source files MIT =
src/opie_format.{c,h}
src/opie_sync.{c,h}
src/opie_xml.{h,c}
libopensync-plugin-opie-curl-setopt.patch:
--- NEW FILE libopensync-plugin-opie-curl-setopt.patch ---
--- src/opie_comms.c.orig 2009-02-07 13:59:53.000000000 +0100
+++ src/opie_comms.c 2009-02-07 14:01:05.000000000 +0100
@@ -64,10 +64,10 @@
const char *OPIE_CALENDAR_FILE = "Applications/datebook/datebook.xml";
const char *OPIE_CATEGORY_FILE = "Settings/Categories.xml";
-int opie_curl_fwrite(void* buffer, size_t size, size_t nmemb, void* stream);
-int opie_curl_strwrite(void *buffer, size_t size, size_t nmemb, void *stream);
-int opie_curl_nullwrite(void *buffer, size_t size, size_t nmemb, void *stream);
-int opie_curl_strread(void *buffer, size_t size, size_t nmemb, void *stream);
+size_t opie_curl_fwrite(void* buffer, size_t size, size_t nmemb, void* stream);
+size_t opie_curl_strwrite(void *buffer, size_t size, size_t nmemb, void *stream);
+size_t opie_curl_nullwrite(void *buffer, size_t size, size_t nmemb, void *stream);
+size_t opie_curl_strread(void *buffer, size_t size, size_t nmemb, void *stream);
gboolean ftp_fetch_files(OpieSyncEnv* env, GList* files_to_fetch);
gboolean scp_fetch_files(OpieSyncEnv* env, GList* files_to_fetch);
gboolean ftp_put_files(OpieSyncEnv* env, GList* files_to_put);
@@ -1146,7 +1146,7 @@
/*
* opie_curl_fwrite
*/
-int opie_curl_fwrite(void *buffer, size_t size, size_t nmemb, void *stream)
+size_t opie_curl_fwrite(void *buffer, size_t size, size_t nmemb, void *stream)
{
size_t written = fwrite(buffer, size, nmemb, (FILE *)stream);
return written;
@@ -1155,7 +1155,7 @@
/*
* opie_curl_strwrite
*/
-int opie_curl_strwrite(void *buffer, size_t size, size_t nmemb, void *stream)
+size_t opie_curl_strwrite(void *buffer, size_t size, size_t nmemb, void *stream)
{
g_string_append_len((GString *)stream, buffer, size * nmemb);
return size * nmemb;
@@ -1164,7 +1164,7 @@
/*
* opie_curl_nullwrite
*/
-int opie_curl_nullwrite(void *buffer, size_t size, size_t nmemb, void *stream)
+size_t opie_curl_nullwrite(void *buffer, size_t size, size_t nmemb, void *stream)
{
return size * nmemb;
}
@@ -1172,7 +1172,7 @@
/*
* opie_curl_strread
*/
-int opie_curl_strread(void *buffer, size_t size, size_t nmemb, void *stream)
+size_t opie_curl_strread(void *buffer, size_t size, size_t nmemb, void *stream)
{
char *str = ((char *)stream) + m_totalwritten;
if(str[0] == '\0')
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libopensync-plugin-opie/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 20 Jun 2008 07:50:24 -0000 1.3
+++ .cvsignore 27 Mar 2009 18:29:25 -0000 1.4
@@ -1 +1 @@
-libopensync-plugin-opie-0.36.tar.bz2
+libopensync-plugin-opie-0.22.tar.bz2
Index: libopensync-plugin-opie.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libopensync-plugin-opie/devel/libopensync-plugin-opie.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libopensync-plugin-opie.spec 25 Feb 2009 17:02:24 -0000 1.5
+++ libopensync-plugin-opie.spec 27 Mar 2009 18:29:25 -0000 1.6
@@ -1,17 +1,21 @@
Name: libopensync-plugin-opie
-Version: 0.36
+Epoch: 1
+Version: 0.22
Release: 2%{?dist}
Summary: Synchronisation with the Opie handheld environment
Group: System Environment/Libraries
-License: GPLv2
+License: GPLv2 and MIT
+# For a breakdown of the licensing, see PACKAGE-LICENSING
URL: http://www.opensync.org
Source0: http://www.opensync.org/download/releases/%{version}/%{name}-%{version}.tar.bz2
+Source1: PACKAGE-LICENSING
+Patch0: libopensync-plugin-opie-curl-setopt.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: cmake
-BuildRequires: libopensync-devel >= 0.36
+BuildRequires: libopensync-devel = 1:0.22
BuildRequires: libcurl-devel
+BuildRequires: openssl-devel
%description
This OpenSync plugin is intended to allow synchronisation with the Opie
@@ -19,31 +23,39 @@
%prep
%setup -q
+%patch0
%build
-mkdir build
-cd build
-%cmake -DCMAKE_SKIP_RPATH=YES ../
-make VERBOSE=1 %{?_smp_mflags}
+%configure
+make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
-cd build
make install DESTDIR=$RPM_BUILD_ROOT
+find $RPM_BUILD_ROOT -type f -name *.la -exec rm -f {} \;
+
+cp %{SOURCE1} PACKAGE-LICENSING
+
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
-%doc AUTHORS COPYING README
-%{_libdir}/opensync-1.0/plugins/opie-sync.so
-%{_libdir}/opensync-1.0/formats/opie.so
-%{_datadir}/opensync-1.0/defaults/opie-sync
+%doc AUTHORS COPYING README PACKAGE-LICENSING
+%{_libdir}/opensync/plugins/opie_sync.so
+%{_libdir}/opensync/formats/opie.so
+%{_datadir}/opensync/defaults/opie-sync
%changelog
-* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.36-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+* Wed Feb 11 2009 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 1:0.22-2
+- Use versioned BR
+- fix license and add file breakdown
+
+* Sat Feb 07 2009 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 1:0.22-1
+- downgrade (#474070)
* Fri Jun 20 2008 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
- 0.36-1
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libopensync-plugin-opie/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 20 Jun 2008 07:50:24 -0000 1.3
+++ sources 27 Mar 2009 18:29:25 -0000 1.4
@@ -1 +1 @@
-ac830920a71ff8fee6138a2d64897cde libopensync-plugin-opie-0.36.tar.bz2
+29b0fea90a4782f68e8017db32e3b6ea libopensync-plugin-opie-0.22.tar.bz2
- Previous message: rpms/libselinux/devel libselinux-rhat.patch, 1.186, 1.187 libselinux.spec, 1.363, 1.364
- Next message: rpms/libselinux/F-10 .cvsignore, 1.176, 1.177 libselinux-rhat.patch, 1.172, 1.173 libselinux.spec, 1.348, 1.349 sources, 1.180, 1.181
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list