[packages/ORBit2] - fix for new automake - rel 4

baggins baggins at pld-linux.org
Sat Dec 7 11:02:04 CET 2013


commit 32660e5a800cbc68e6ff26c749a222ef8def45fd
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sat Dec 7 11:01:52 2013 +0100

    - fix for new automake
    - rel 4

 ORBit2-build-fix.patch | 23 +++++++++++------------
 ORBit2.spec            |  2 +-
 2 files changed, 12 insertions(+), 13 deletions(-)
---
diff --git a/ORBit2.spec b/ORBit2.spec
index 0d5d33e..ba89954 100644
--- a/ORBit2.spec
+++ b/ORBit2.spec
@@ -8,7 +8,7 @@ Summary(fr.UTF-8):	Requète d'Objects CORBA
 Summary(pl.UTF-8):	Wysoko wydajny CORBA Object Request Broker
 Name:		ORBit2
 Version:	2.14.19
-Release:	3
+Release:	4
 Epoch:		1
 License:	GPL v2+/LGPL v2+
 Group:		Libraries
diff --git a/ORBit2-build-fix.patch b/ORBit2-build-fix.patch
index a1c1725..ec5610b 100644
--- a/ORBit2-build-fix.patch
+++ b/ORBit2-build-fix.patch
@@ -23,15 +23,14 @@ diff -ur ORBit2-2.14.19.orig/linc2/src/Makefile.am ORBit2-2.14.19/linc2/src/Make
  
  if OS_WIN32
  else
-diff -ur ORBit2-2.14.19.orig/linc2/src/Makefile.in ORBit2-2.14.19/linc2/src/Makefile.in
---- ORBit2-2.14.19.orig/linc2/src/Makefile.in	2010-09-28 09:39:39.000000000 +0000
-+++ ORBit2-2.14.19/linc2/src/Makefile.in	2013-04-01 20:42:51.310571646 +0000
-@@ -244,7 +244,7 @@
- #	-I$(top_srcdir)/include    
- INCLUDES = -I$(top_builddir)/linc2/include \
- 	-I$(top_srcdir)/linc2/include $(LINC_CFLAGS) $(WARN_CFLAGS) \
--	-DG_DISABLE_DEPRECATED $(am__append_1)
-+	$(am__append_1)
- liblinc_la_SOURCES = \
- 	linc.c			\
- 	linc-connection.c	\
+--- ORBit2-2.14.19/test/everything/Makefile.am~	2013-12-07 10:59:17.000000000 +0100
++++ ORBit2-2.14.19/test/everything/Makefile.am	2013-12-07 11:00:27.439835598 +0100
+@@ -78,7 +78,7 @@
+ BUILT_SOURCES = ${EVERYTHING_BUILT} everything-imodule.c
+ CLEANFILES = ${BUILT_SOURCES} iorfile
+ 
+-TESTS = $(srcdir)/test.sh
++TESTS = test.sh
+ 
+ EXTRA_DIST = $(IDL_FILES) test.sh $(included_src)
+ 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/ORBit2.git/commitdiff/32660e5a800cbc68e6ff26c749a222ef8def45fd



More information about the pld-cvs-commit mailing list