rpms/libmal/devel libmal-0.31-64bit.patch, NONE, 1.1 libmal-0.31-pi12.patch, NONE, 1.1 libmal.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Rex Dieter (rdieter) fedora-extras-commits at redhat.com
Wed Mar 22 15:22:43 UTC 2006


Author: rdieter

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

Modified Files:
	.cvsignore sources 
Added Files:
	libmal-0.31-64bit.patch libmal-0.31-pi12.patch libmal.spec 
Log Message:
auto-import libmal-0.31-1 on branch devel from libmal-0.31-1.src.rpm

libmal-0.31-64bit.patch:

--- NEW FILE libmal-0.31-64bit.patch ---
--- libmal-0.31/configure.64	2003-03-23 11:33:42.000000000 -0600
+++ libmal-0.31/configure	2004-12-16 11:37:13.000000000 -0600
@@ -8102,7 +8102,7 @@
 pilotlibs=no
 PILOT_LIBS="-lpisock"
 
-for pilot_libs in $pilot_prefix/lib /usr/lib /usr/local/lib/ \
+for pilot_libs in $pilot_prefix/lib $libdir /usr/lib /usr/local/lib/ \
   /usr/extra/pilot/lib ; do
    if test -r "$pilot_libs/libpisock.so" ; then
       pilotlibs=yes
--- libmal-0.31/configure.in.64	2003-03-22 12:37:22.000000000 -0600
+++ libmal-0.31/configure.in	2004-12-16 11:36:57.000000000 -0600
@@ -60,7 +60,7 @@
 pilotlibs=no
 PILOT_LIBS="-lpisock"
 
-for pilot_libs in $pilot_prefix/lib /usr/lib /usr/local/lib/ \
+for pilot_libs in $pilot_prefix/lib $libdir /usr/lib /usr/local/lib/ \
   /usr/extra/pilot/lib ; do
    if test -r "$pilot_libs/libpisock.so" ; then
       pilotlibs=yes

libmal-0.31-pi12.patch:

--- NEW FILE libmal-0.31-pi12.patch ---
--- libmal-0.31/libmal.c.pi12	2003-03-23 11:00:26.000000000 -0600
+++ libmal-0.31/libmal.c	2005-06-14 10:51:54.000000000 -0500
@@ -508,8 +508,13 @@
     uint8 buffer[BUFFERSIZE];
     AGBufferReader * r = NULL;
 
+#if (PILOT_LINK_MAJOR >= 12)
+    rc = dlp_ReadRecordByIndex(sd, userConfigDBHandle, 0, (void *)buffer,
+                               &id, &attr, &cat);
+#else
     rc = dlp_ReadRecordByIndex(sd, userConfigDBHandle, 0, (void *)buffer,
                                &id, &bufferSize, &attr, &cat);
+#endif
 
     if (rc < 0) {
 #ifdef _DEBUG
@@ -541,8 +546,13 @@
     uint8 buffer[BUFFERSIZE];
     AGBufferReader * r = NULL;
 
+#if (PILOT_LINK_MAJOR >= 12)
+    rc = dlp_ReadRecordByIndex(sd, userConfigDBHandle, 0, (void *)buffer,
+                               &id, &attr, &cat);
+#else
     rc = dlp_ReadRecordByIndex(sd, userConfigDBHandle, 0, (void *)buffer,
                                &id, &bufferSize, &attr, &cat);
+#endif
 
     if (rc < 0) {
 #ifdef _DEBUG
@@ -596,9 +606,13 @@
             AGUserConfigWriteData(deviceUserConfig, (AGWriter*)w);
         }
 
-        result = dlp_ReadRecordByIndex(sd, userConfigDBHandle, 0, (void *)buffer
-                                       ,
-                                       &id, &bufferSize, &attr, &cat);
+#if (PILOT_LINK_MAJOR >= 12)
+        result = dlp_ReadRecordByIndex(sd, userConfigDBHandle, 0, (void *)buffer,
+                               &id, &attr, &cat);
+#else
+        result = dlp_ReadRecordByIndex(sd, userConfigDBHandle, 0, (void *)buffer,
+                               &id, &bufferSize, &attr, &cat);
+#endif
 
         if (result < 0)
             id = 0;
@@ -881,13 +895,25 @@
     int idx   = pInfo->pilot_RecIndex++;
 
     result = (modonly) ?
+#if (PILOT_LINK_MAJOR >= 12)
+        dlp_ReadNextModifiedRec (sd, pInfo->pilot_rHandle, pInfo->pilot_buffer,
+                                 &pInfo->id, &idx,
+                                 &att, &cat)
+#else
         dlp_ReadNextModifiedRec (sd, pInfo->pilot_rHandle, pInfo->pilot_buffer,
                                  &pInfo->id, &idx,
                                  &size, &att, &cat)
+#endif
         :
+#if (PILOT_LINK_MAJOR >= 12)
+        dlp_ReadRecordByIndex(sd, pInfo->pilot_rHandle, idx,
+                              pInfo->pilot_buffer, &pInfo->id,
+                              &att, &cat);
+#else
         dlp_ReadRecordByIndex(sd, pInfo->pilot_rHandle, idx,
                               pInfo->pilot_buffer, &pInfo->id,
                               &size, &att, &cat);
+#endif
     
     if (result < 0) {
         closeDatabase(pInfo);
@@ -1208,7 +1234,11 @@
     
     strcpy(addr.pi_device, device);
     
+#if (PILOT_LINK_MAJOR >= 12)
+    ret = pi_bind(sd, (struct sockaddr*)&addr);
+#else
     ret = pi_bind(sd, (struct sockaddr*)&addr, sizeof(addr));
+#endif
     if(ret == -1) {
         /*fprintf(stderr, "Unable to bind to port '%s'.\n", device);*/
         (*printerror) ("Unable to bind to port '%s'.\n", device);


--- NEW FILE libmal.spec ---

Summary: a convenience library for malsync
Name:    libmal
# NOTE: this isn't the latest version, but is the last version known to 
# work with kdepim
Version: 0.31 
Release: 1%{?dist}

License: MPL	
Url: 	 http://jasonday.home.att.net/code/libmal/ 
Source:  http://jasonday.home.att.net/code/libmal/libmal-0.31.tar.gz 
Group:   System Environment/Libraries	
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Patch1: libmal-0.31-64bit.patch
# pilot-link-0.12 fixes
Patch2: libmal-0.31-pi12.patch

BuildRequires: pilot-link-devel 

%description
A convenience library of the object files contained in Tom Whittaker's 
malsync distribution, along with a few wrapper functions.

%package devel
Summary: Header and library files for %{name}
Group:   Development/Libraries
Requires: %{name} = %{version}-%{release}
%description devel
%{summary}.


%prep
%setup -q 

%patch1 -p1 -b .64bits
%patch2 -p1 -b .pi12


%build
%configure --disable-static

make %{?_smp_mflags} 


%install
rm -rf $RPM_BUILD_ROOT

make install DESTDIR=$RPM_BUILD_ROOT

## Unpackaged files
rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la


%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root)
%doc AUTHORS ChangeLog NEWS README TODO
%{_libdir}/lib*.so.*

%files devel
%defattr(-,root,root)
%{_libdir}/lib*.so
%{_includedir}/*


%changelog
* Mon Oct 31 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.31-1
- cleanup for Extras

* Tue Jun 14 2005 Rex Dieter 0.31-0.1
- pilot-link-0.12 fixes

* Thu Dec 16 2004 Rex Dieter <rexdieter[AT]users.sf.net> 0.31-0.fdr.3
- fix 64 builds (for finding pilot-link libs)

* Wed Jul 21 2004 Rex Dieter <rexdieter at sf.net> 0.31-0.fdr.2
- nuke .la file(s).
- --disable-static

* Fri Oct 17 2003 Rex Dieter <rexdieter at sf.net> 0.31-0.fdr.1
- first try



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libmal/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	22 Mar 2006 15:21:56 -0000	1.1
+++ .cvsignore	22 Mar 2006 15:22:43 -0000	1.2
@@ -0,0 +1 @@
+libmal-0.31.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libmal/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	22 Mar 2006 15:21:56 -0000	1.1
+++ sources	22 Mar 2006 15:22:43 -0000	1.2
@@ -0,0 +1 @@
+3d1fd0a5ece6de47d55df5829ee8b6a2  libmal-0.31.tar.gz




More information about the fedora-extras-commits mailing list