--- a/ChangeLog	Mon May 14 09:59:21 2007 +0000
+++ b/ChangeLog	Mon May 14 10:22:16 2007 +0000
@@ -1,3 +1,11 @@
+2007-05-14  Damien Carbery <[email protected]>
+
+	* base-specs/gcalctool.spec: Bump to 5.19.2.
+	* base-specs/orca.spec: Bump to 2.19.2.
+	* base-specs/libmusicbrainz.spec: Bump to 2.1.5. Remove upstream patch,
+	  01-fixduration.
+	* patches/libmusicbrainz-01-fixduration.diff: Removed, upstream.
+
 2007-05-14  Damien Carbery <[email protected]>
 
 	* SUNWgnome-doc-utils.spec: Add SUNWgnome-common-devel dependency for

--- a/base-specs/gcalctool.spec	Mon May 14 09:59:21 2007 +0000
+++ b/base-specs/gcalctool.spec	Mon May 14 10:22:16 2007 +0000
@@ -11,7 +11,7 @@
 Name:         gcalctool
 License:      GPL
 Group:        System/GUI/GNOME
-Version:      5.19.1
+Version:      5.19.2
 Release:      1
 Distribution: Java Desktop System
 Vendor:       Sun Microsystems, Inc.
@@ -112,6 +112,9 @@
 %{_mandir}/man1/
 
 %changelog
+* Mon May 14 2007 - [email protected]
+- Bump to 5.19.2.
+
 * Thu May 10 2007 - [email protected]
 - Bump to 5.19.1.
 

--- a/base-specs/libmusicbrainz.spec	Mon May 14 09:59:21 2007 +0000
+++ b/base-specs/libmusicbrainz.spec	Mon May 14 10:22:16 2007 +0000
@@ -11,7 +11,7 @@
 Name:         libmusicbrainz
 License:      LGPL
 Group:        System Environment/Libraries
-Version:      2.1.4
+Version:      2.1.5
 Release:      1
 Distribution: Java Desktop System
 Vendor:       Sun Microsystems, Inc.
@@ -89,6 +89,8 @@
 %{_libdir}/pkgconfig/libmusicbrainz.pc
 
 %changelog
+* Mon May 14 2006 - [email protected]
+- Bump to 2.1.5. Remove upstream patch, 01-fixduration.
 * Mon Jan 22 2006 - [email protected]
 - Add patch comments.
 * Thu Nov 30 2006 - [email protected]

--- a/base-specs/orca.spec	Mon May 14 09:59:21 2007 +0000
+++ b/base-specs/orca.spec	Mon May 14 10:22:16 2007 +0000
@@ -10,7 +10,7 @@
 Name:           orca
 License:        LGPL
 Group:          System/Library
-Version:        2.19.1
+Version:        2.19.2
 Release:        1
 Distribution:   Java Desktop System
 Vendor:	        Sun Microsystems, Inc.
@@ -91,6 +91,8 @@
 %doc AUTHORS NEWS README ChangeLog
 
 %changelog
+* Mon May 14 2007 - [email protected]
+- Bump to 2.19.2.
 * Thu May 10 2007 - [email protected]
 - Bump to 2.19.1.
 * Thu Apr 12 2007 - [email protected]

--- a/patches/libmusicbrainz-01-fixduration.diff	Mon May 14 09:59:21 2007 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
---- libmusicbrainz-2.1.4/osdep/mb_solaris.cpp-orig	Fri Sep 22 16:15:03 2000
-+++ libmusicbrainz-2.1.4/osdep/mb_solaris.cpp	Wed Dec 20 15:05:44 2006
-@@ -90,7 +90,7 @@
-     if (!ret) {
-         assert(te.cdte_format == CDROM_LBA);
- 
--        lba = ntohl(te.cdte_addr.lba);  // network to host order (long)
-+	lba = te.cdte_addr.lba;
-     }
- 
-     return ret;
-@@ -104,6 +104,8 @@
-    int  first;
-    int  last;
-    int  lba;
-+   int  blksize;
-+   int  scale;
-    int  i;
-    char err[256];
- 
-@@ -120,6 +122,16 @@
-        return false;
-    }
- 
-+   // see what scaling we need to perform to correct for
-+   // non-standard blocksizes
-+   if (ioctl(fd, CDROMGBLKMODE, &blksize) == -1) {
-+	ReportError("Cannot get cdrom blocksize");
-+	scale = 1;	// and hope for the best 
-+   } else {
-+       // lba standard blocksize is 2048
-+       scale = 2048/blksize;
-+   }
-+
-    // Initialize cdinfo to all zeroes.
-    memset(&cdinfo, 0, sizeof(MUSICBRAINZ_CDINFO));
- 
-@@ -146,13 +158,13 @@
-                 CDROM_LEADOUT, 
-                 lba);
- 
--   cdinfo.FrameOffset[0] = lba / 4 + 150;  // Solaris 2048 bytes blocksize hack
-+   cdinfo.FrameOffset[0] = lba / scale + 150;
- 
-    // Now, for every track, find out the block address where it starts.
-    for (i = first; i <= last; i++)
-    {
-       ReadTOCEntry(fd, i, lba);
--      cdinfo.FrameOffset[i] = lba / 4 + 150;  // note factor 1/4
-+      cdinfo.FrameOffset[i] = lba / scale + 150;
-    }
- 
-    cdinfo.FirstTrack = first;