packages: iodine/iodine-make.patch, iodine/iodine-opt.patch, iodine/iodine....

[tommat]

Author: tommat                       Date: Wed Jan 27 01:01:40 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 0.5.2

---- Files affected:
packages/iodine:
   iodine-make.patch (1.2 -> 1.3) , iodine-opt.patch (1.2 -> 1.3) , iodine.spec (1.6 -> 1.7) 

---- Diffs:

================================================================
Index: packages/iodine/iodine-make.patch
diff -u packages/iodine/iodine-make.patch:1.2 packages/iodine/iodine-make.patch:1.3
--- packages/iodine/iodine-make.patch:1.2	Fri Nov 21 12:46:24 2008
+++ packages/iodine/iodine-make.patch	Wed Jan 27 02:01:31 2010
@@ -1,31 +1,37 @@
---- iodine-0.4.2/Makefile	2008-11-21 13:44:41.755943542 +0200
-+++ iodine-0.4.2/Makefile	2008-11-21 13:45:21.234222315 +0200
+diff -Nur iodine-0.5.2.orig/Makefile iodine-0.5.2/Makefile
+--- iodine-0.5.2.orig/Makefile	2009-03-21 14:07:49.000000000 +0100
++++ iodine-0.5.2/Makefile	2010-01-27 01:56:16.000000000 +0100
 @@ -1,4 +1,4 @@
 -prefix=/usr/local
 +prefix=/usr
  sbindir=$(prefix)/sbin
  datadir=$(prefix)/share
  mandir=$(datadir)/man
-@@ -15,7 +15,7 @@
+@@ -14,10 +14,10 @@
+ RM=rm
  RM_FLAGS=-f
  
+-TARGETOS = `uname`
++TARGETOS = Linux
+ 
  all: 
--	@(cd src; $(MAKE) all)
-+	$(MAKE) -C src all
+-	@(cd src; $(MAKE) TARGETOS=$(TARGETOS) all)
++	$(MAKE) -C src TARGETOS=$(TARGETOS) all
  
- install: all
- 	$(MKDIR) $(MKDIR_FLAGS) $(DESTDIR)$(sbindir)
-@@ -36,10 +36,10 @@
+ cross-mingw: 
+ 	@(cd src; $(MAKE) TARGETOS=windows32 CC=i686-mingw32-gcc all)
+@@ -52,11 +52,11 @@
+ test: all
  	@echo "!! The check library is required for compiling and running the tests"
  	@echo "!! Get it at http://check.sf.net"
--	@(cd tests; $(MAKE) all)
-+	$(MAKE) -C tests all
+-	@(cd tests; $(MAKE) TARGETOS=$(TARGETOS) all)
++	$(MAKE) -C tests TARGETOS=$(TARGETOS) all
  
  clean:
  	@echo "Cleaning..."
 -	@(cd src; $(MAKE) clean)
 -	@(cd tests; $(MAKE) clean)
-+	@$(MAKE) -C src clean
-+	@$(MAKE) -C tests clean
- 	@rm -rf bin
++	$(MAKE) -C src clean
++	$(MAKE) -C tests clean
+ 	@rm -rf bin iodine-latest-win32*
  

================================================================
Index: packages/iodine/iodine-opt.patch
diff -u packages/iodine/iodine-opt.patch:1.2 packages/iodine/iodine-opt.patch:1.3
--- packages/iodine/iodine-opt.patch:1.2	Fri Nov 21 12:46:25 2008
+++ packages/iodine/iodine-opt.patch	Wed Jan 27 02:01:31 2010
@@ -1,12 +1,13 @@
---- iodine-0.4.2/src/Makefile~	2008-11-21 13:42:44.000000000 +0200
-+++ iodine-0.4.2/src/Makefile	2008-11-21 13:43:11.606739911 +0200
-@@ -8,8 +8,9 @@
- OS = `uname | tr "a-z" "A-Z"`
+diff -Nur iodine-0.5.2.orig/src/Makefile iodine-0.5.2/src/Makefile
+--- iodine-0.5.2.orig/src/Makefile	2009-03-21 14:07:49.000000000 +0100
++++ iodine-0.5.2/src/Makefile	2010-01-27 01:29:26.000000000 +0100
+@@ -9,8 +9,9 @@
  ARCH = `uname -m`
  
+ LIBPATH = -L.
 +OPTFLAGS = -g -Wall
- LDFLAGS =  -lz `sh osflags link`
--CFLAGS = -c -g -Wall -D$(OS) -pedantic
+ LDFLAGS =  -lz `sh osflags $(TARGETOS) link` $(LIBPATH)
+-CFLAGS = -c -g -Wall -D$(OS) -pedantic `sh osflags $(TARGETOS) cflags`
 +CFLAGS = -c $(OPTFLAGS) -D$(OS) -pedantic
  
  all: stateos $(CLIENT) $(SERVER)

================================================================
Index: packages/iodine/iodine.spec
diff -u packages/iodine/iodine.spec:1.6 packages/iodine/iodine.spec:1.7
--- packages/iodine/iodine.spec:1.6	Fri Nov 21 12:47:45 2008
+++ packages/iodine/iodine.spec	Wed Jan 27 02:01:31 2010
@@ -2,12 +2,12 @@
 Summary:	IP over DNS is now easy
 Summary(pl.UTF-8):	Łatwa w użyciu implementacja IP over DNS
 Name:		iodine
-Version:	0.4.2
+Version:	0.5.2
 Release:	1
 License:	GPL
 Group:		Networking
 Source0:	http://code.kryo.se/iodine/%{name}-%{version}.tar.gz
-# Source0-md5:	890f13ab9ee7ea722baf0ceb3ee561c0
+# Source0-md5:	6952343cc4614857f83dbb81247871e7
 Patch0:		%{name}-opt.patch
 Patch1:		%{name}-make.patch
 URL:		http://code.kryo.se/iodine/
@@ -29,7 +29,7 @@
 %patch1 -p1
 
 %build
-%{__make} -C src \
+%{__make} \
 	CC="%{__cc}" \
 	OPTFLAGS="%{rpmcflags}"
 
@@ -55,6 +55,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.7  2010/01/27 01:01:31  tommat
+- up to 0.5.2
+
 Revision 1.6  2008/11/21 11:47:45  glen
 - update to 0.4.2
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/iodine/iodine-make.patch?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/iodine/iodine-opt.patch?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/iodine/iodine.spec?r1=1.6&r2=1.7&f=u