packages: di/di-Makefile.patch, di/di.spec - 4.23

[lisu]

Author: lisu                         Date: Thu May 13 07:32:48 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- 4.23

---- Files affected:
packages/di:
   di-Makefile.patch (1.4 -> 1.5) , di.spec (1.48 -> 1.49) 

---- Diffs:

================================================================
Index: packages/di/di-Makefile.patch
diff -u packages/di/di-Makefile.patch:1.4 packages/di/di-Makefile.patch:1.5
--- packages/di/di-Makefile.patch:1.4	Thu May  6 12:25:19 2010
+++ packages/di/di-Makefile.patch	Thu May 13 09:32:42 2010
@@ -1,23 +1,23 @@
---- di-4.22/Makefile~	2010-05-06 06:50:33.000000000 +0200
-+++ di-4.22/Makefile	2010-05-06 12:22:40.266987097 +0200
-@@ -136,9 +136,9 @@
- 	$(CP) -f config.win config.h
+--- di-4.23/Makefile~	2010-05-11 07:55:01.000000000 +0200
++++ di-4.23/Makefile	2010-05-13 09:29:39.486116575 +0200
+@@ -137,9 +137,9 @@
+ 	copy /y NUL: reqlibs.txt
  	$(MAKE) \
  		CC=cl LD=cl EXE_EXT=".exe" OBJ_EXT=".obj" \
 -		CFLAGS="$(CFLAGS) -nologo -O2 \
 +		CFLAGS="$(CFLAGS) $(OPTFLAGS) -nologo" \
- 		-DDEFAULT_FORMAT=\\\"sMbuvpT\\\"" \
+ 		-DDEFAULT_FORMAT=\\\"MbuvpT\\\"" \
 -		LDFLAGS="-nologo -O2" di-programs
 +		LDFLAGS="-nologo" di-programs
  
  # This was tested using cygwin
  windows-gcc:
-@@ -148,8 +148,7 @@
- 	$(MAKE) \
- 		CC=gcc LD=gcc EXE_EXT=".exe" OBJ_EXT=".o" \
+@@ -162,8 +162,7 @@
+ 		CC=mingw32-gcc LD=mingw32-gcc \
+ 		EXE_EXT=".exe" OBJ_EXT=".o" \
  		CFLAGS="$(CFLAGS) -g -O2 \
--		-DDEFAULT_FORMAT=\\\"sMbuvpT\\\"" \
--		LDFLAGS="-g -O2" di-programs
+-		-DDEFAULT_FORMAT=\\\"MbuvpT\\\"" \
+-		LDFLAGS="-g -O2" mingw-$(PROG).exe
 +		-DDEFAULT_FORMAT=\\\"sMbuvpT\\\""
  
  os2-gcc:

================================================================
Index: packages/di/di.spec
diff -u packages/di/di.spec:1.48 packages/di/di.spec:1.49
--- packages/di/di.spec:1.48	Thu May  6 12:25:09 2010
+++ packages/di/di.spec	Thu May 13 09:32:42 2010
@@ -2,12 +2,12 @@
 Summary:	Disk Info - disk information utility
 Summary(pl.UTF-8):	Disk Info - informacje o dyskach
 Name:		di
-Version:	4.22
+Version:	4.23
 Release:	1
 License:	custom (see LICENSE* files)
 Group:		Applications/System
 Source0:	http://www.gentoo.com/di/%{name}-%{version}.tar.gz
-# Source0-md5:	18deed2ec26c27c04b231cfc683ea0d9
+# Source0-md5:	795e072d528c8e8f0d8cad094d6ae003
 Patch0:		%{name}-Makefile.patch
 Patch1:		%{name}-symlink.patch
 URL:		http://www.gentoo.com/di/
@@ -68,6 +68,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.49  2010/05/13 07:32:42  lisu
+- 4.23
+
 Revision 1.48  2010/05/06 10:25:09  lisu
 - updated to 4.22
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/di/di-Makefile.patch?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/di/di.spec?r1=1.48&r2=1.49&f=u