[Rasta-commits] rev 213 - in trunk: . clrasta redhat

[svn-commits at oss.oracle.com]

Author: jlbec
Date: 2003-10-23 12:49:51 -0500 (Thu, 23 Oct 2003)
New Revision: 213

Modified:
   trunk/
   trunk/ChangeLog
   trunk/clrasta/clrasta.c
   trunk/configure.in
   trunk/redhat/rasta.spec.in
Log:
0.1.2


Property changes on: trunk
___________________________________________________________________
Name: svn:ignore
   - INSTALL
build-stamp
install-sh
ltmain.sh
missing
mkinstalldirs
aclocal.m4
stamp-h.in
Makefile.in
configure
libtool
stamp-h
stamp-h1
Makefile
*.pc
*.tar.gz
system.rasta
core.*
cscope.*
autom4te.cache
config.*
.*.sw?

   + INSTALL
build-stamp
install-sh
ltmain.sh
missing
mkinstalldirs
aclocal.m4
stamp-h.in
Makefile.in
configure
libtool
stamp-h
stamp-h1
Makefile
*.pc
*.tar.gz
system.rasta
core.*
cscope.*
autom4te.cache
config.*
.*.sw?
depcomp


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2003-10-23 01:07:03 UTC (rev 212)
+++ trunk/ChangeLog	2003-10-23 17:49:51 UTC (rev 213)
@@ -1,5 +1,12 @@
-2003-09-24	Joel Becker	<joel.becker at oracle.com>
+2003-10-23	Joel Becker	<joel.becker at oracle.com>
 
+	* configure.in: Bump to 0.1.2.
+	* redhat/rasta.spec.in: Fix stupid RPM error-on-unpackaged.
+		Add .la files to rasta-devel package.
+	* clrasta/clrasta.c: Fix hidden screen behavior.
+	
+2003-10-22	Joel Becker	<joel.becker at oracle.com>
+
 	* librasta/renumeration.c: 64bit cast warning.
 	* gtkrasta/gtkrasta.c: 64bit cast warning.
 	* redhat/rasta.spec.in: Work on x86_64.

Modified: trunk/clrasta/clrasta.c
===================================================================
--- trunk/clrasta/clrasta.c	2003-10-23 01:07:03 UTC (rev 212)
+++ trunk/clrasta/clrasta.c	2003-10-23 17:49:51 UTC (rev 213)
@@ -2058,7 +2058,7 @@
             g_free(err_data);
         err_data = NULL;
 
-        if (out_data && out_len > 0)
+        if (out_data)
         {
             rc = -ENOMEM;
             tmp = g_new(gchar, out_len + 1);
@@ -2483,9 +2483,11 @@
     g_return_val_if_fail(ctxt != NULL, FALSE);
     g_return_val_if_fail(screen != NULL, FALSE);
 
+#if DEBUG
     title = rasta_screen_get_title(screen);
     g_print("Hidden screen \"%s\"\n", title);
     g_free(title);
+#endif  /* DEBUG */
 
     if (rasta_initcommand_is_required(ctxt, screen) == FALSE)
     {

Modified: trunk/configure.in
===================================================================
--- trunk/configure.in	2003-10-23 01:07:03 UTC (rev 212)
+++ trunk/configure.in	2003-10-23 17:49:51 UTC (rev 213)
@@ -22,9 +22,9 @@
 #
 MAJOR_VERSION=0
 MINOR_VERSION=1
-MICRO_VERSION=1
-INTERFACE_AGE=0
-BINARY_AGE=0
+MICRO_VERSION=2
+INTERFACE_AGE=1
+BINARY_AGE=1
 VERSION="${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}"
 AC_SUBST(MAJOR_VERSION)
 AC_SUBST(MINOR_VERSION)

Modified: trunk/redhat/rasta.spec.in
===================================================================
--- trunk/redhat/rasta.spec.in	2003-10-23 01:07:03 UTC (rev 212)
+++ trunk/redhat/rasta.spec.in	2003-10-23 17:49:51 UTC (rev 213)
@@ -5,7 +5,10 @@
 # Macros
 # This one is hardcoded because, well, it belongs there
 %define _prefix /usr
+# This is to make RPM not be stupid
+%define _unpackaged_files_terminate_build 0
 
+
 Summary: The RASTA system libraries
 Name: rasta
 Version: @VERSION@
@@ -145,10 +148,12 @@
 %ifarch x86_64
 /usr/lib64/*.a
 /usr/lib64/*.so
+/usr/lib64/*.la
 /usr/lib64/pkgconfig/*.pc
 %else
 /usr/lib/*.a
 /usr/lib/*.so
+/usr/lib/*.la
 /usr/lib/pkgconfig/*.pc
 %endif
 /usr/include/