packages: karma/karma-gkh.patch, karma/karma-makefix.patch, karma/karma.spe...

qboosh qboosh at pld-linux.org
Sat Dec 10 21:55:38 CET 2011 

Author: qboosh                       Date: Sat Dec 10 20:55:38 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 0.7.20 (0.7.25 has no sources published)
- updated makefix,gkh patches, removed obsolete amd64 patch

---- Files affected:
packages/karma:
   karma-gkh.patch (1.1 -> 1.2) , karma-makefix.patch (1.1 -> 1.2) , karma.spec (1.14 -> 1.15) , karma-amd64.patch (1.1 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/karma/karma-gkh.patch
diff -u packages/karma/karma-gkh.patch:1.1 packages/karma/karma-gkh.patch:1.2
--- packages/karma/karma-gkh.patch:1.1	Tue Jan 27 01:26:05 2004
+++ packages/karma/karma-gkh.patch	Sat Dec 10 21:55:33 2011
@@ -1,13 +1,3 @@
---- karma/source/lib/karma/packages/r/Linux/atm.c.orig	2001-05-05 01:36:35.000000000 +0200
-+++ karma/source/lib/karma/packages/r/Linux/atm.c	2004-01-27 01:00:20.307102136 +0100
-@@ -93,6 +93,7 @@
- #ifndef SOL_ATM
- #  define SOL_ATM   264
- #endif
-+#define _LINUX_TYPES_H
- #include <linux/atm.h>
- #include <linux/atmdev.h>
- #include <linux/atmsvc.h>
 --- karma/source/modules/xray/sbcustom.c.orig	1997-09-03 01:32:05.000000000 +0200
 +++ karma/source/modules/xray/sbcustom.c	2004-01-27 01:18:26.223017824 +0100
 @@ -476,11 +476,10 @@

================================================================
Index: packages/karma/karma-makefix.patch
diff -u packages/karma/karma-makefix.patch:1.1 packages/karma/karma-makefix.patch:1.2
--- packages/karma/karma-makefix.patch:1.1	Wed Dec  4 21:30:15 2002
+++ packages/karma/karma-makefix.patch	Sat Dec 10 21:55:33 2011
@@ -1,48 +1,65 @@
---- karma/source/lib/makefiles/Linux/karma.orig	Fri Feb  5 06:10:18 1999
-+++ karma/source/lib/makefiles/Linux/karma	Sun Aug 18 10:20:38 2002
-@@ -1,7 +1,7 @@
- LIB := karma
+--- karma-1.7.20/source/lib/makefiles/Linux/karma.orig	2003-09-25 08:09:34.000000000 +0200
++++ karma-1.7.20/source/lib/makefiles/Linux/karma	2011-12-09 20:47:12.050524355 +0100
+@@ -2,7 +2,7 @@
  
  CFLAGS :=
--LDFLAGS := -ldl
-+inclibs := -ldl -lm -lrt -lpthread
  DEPENDFLAGS :=
+-LDFLAGS = $(OS_IMPLICIT_LIBS)
++inclibs = $(OS_IMPLICIT_LIBS) -lm -lpthread
  
  include $(KARMAROOT)/source/lib/makefiles/$(OS)/GNUmakefile.rules
---- karma/source/lib/makefiles/Linux/GNUmakefile.rules.orig	Fri Feb  5 06:18:25 1999
-+++ karma/source/lib/makefiles/Linux/GNUmakefile.rules	Sun Aug 18 10:20:25 2002
-@@ -6,6 +6,7 @@
- library := $(KARMASTATICLIBPATH)/lib$(LIB).a
+ 
+--- karma-1.7.20/source/lib/makefiles/Linux/GNUmakefile.rules.orig	2011-05-03 04:32:51.000000000 +0200
++++ karma-1.7.20/source/lib/makefiles/Linux/GNUmakefile.rules	2011-12-09 20:47:05.477190800 +0100
+@@ -35,7 +35,7 @@
+ # Use rm(1) so that old inode is not changed, so running programmes survive
+ 
+ $(shared_target) : $(objects)
+-	$(LDso) -h $(shared_lib) -o $(shared_lib) $(objects) $(LDFLAGS)
++	$(LDso) -shared -Wl,-soname=$(shared_lib) -o $(shared_lib) $(objects) $(LDFLAGS) -L$(KARMALIBPATH) $(inclibs)
+ 	$(RM) $(shared_target) $(KARMALIBPATH)/lib$(LIB).so
+ 	cp -p $(shared_lib) $(KARMALIBPATH)
+ 	$(RM) $(shared_lib)
+--- karma-1.7.20/source/lib/makefiles/generic/karmaX11.orig	2002-08-17 23:31:19.000000000 +0200
++++ karma-1.7.20/source/lib/makefiles/generic/karmaX11	2011-12-10 08:19:26.761915087 +0100
+@@ -6,9 +6,9 @@ DEPENDFLAGS := -I$(XINCLUDEPATH)
+ endif
+ 
+ ifdef XLIBPATH
+-LDFLAGS := -L$(KARMALIBPATH) -L$(XLIBPATH) -lkarma -lXext -lX11
++LDFLAGS := -L$(KARMALIBPATH) -L$(XLIBPATH) -lkarma -lXext -lX11 -lm
+ else
+-LDFLAGS := -L$(KARMALIBPATH) -lkarma -lXext -lX11
++LDFLAGS := -L$(KARMALIBPATH) -lkarma -lXext -lX11 -lm
+ endif
+ 
+ include $(KARMAROOT)/source/lib/makefiles/$(OS)/GNUmakefile.rules
+--- karma-1.7.20/source/lib/makefiles/generic/karmagraphics.orig	2002-12-23 19:35:01.000000000 +0100
++++ karma-1.7.20/source/lib/makefiles/generic/karmagraphics	2011-12-10 08:19:41.925248931 +0100
+@@ -9,9 +9,9 @@ DEPENDFLAGS := -DHAS_X11
  endif
- shared_lib := lib$(LIB).so.$(version)
-+shared_liblink := lib$(LIB).so
- lintlib := $(KARMALIBPATH)/llib-l$(LIB).ln
- shared_target := $(KARMALIBPATH)/$(shared_lib)
- 
-@@ -30,8 +31,9 @@
- 
- 
- $(shared_target):	$(objects)
--	$(LDso) -o $(shared_lib) $(objects) $(LDFLAGS)
-+	$(LDso) -o $(shared_lib) $(objects) $(LDFLAGS) -L$(KARMALIBPATH) $(inclibs) -Wl,-soname=$(shared_lib)
- 	mv $(shared_lib) $(KARMALIBPATH)
-+	ln -s $(shared_lib) $(KARMALIBPATH)/$(shared_liblink)
- 
- 
- $(library):	$(objects)
---- karma/include/gmakedefs/general.h1.orig	Tue Sep 25 21:05:53 2001
-+++ karma/include/gmakedefs/general.h1	Wed Dec  4 21:13:25 2002
-@@ -100,11 +100,11 @@
- CCpp_libdirs = `gcc --print-search-dirs | fgrep libraries: | awk -- '{print $$2}' | sed -e 's*/:*:*g' | sed -e 's*/$$**'`
- CCpp_libs    = "gcc stdc++"
- ifdef _HAS_POSIX_THREADS
--CC           = cc -D_REENTRANT $(kcflags) -Wall -pedantic-errors
-+CC           = cc -D_REENTRANT $(kcflags) -Wall -pedantic
- CCnopedantic = cc -D_REENTRANT $(kcflags) -Wall
- CCpp         = c++ -D_REENTRANT $(kcflags)
+ 
+ ifdef XLIBPATH
+-LDFLAGS := -L$(KARMALIBPATH) -L$(XLIBPATH) -lkarmaX11 -lkarma -lXext -lX11 -ldl
++LDFLAGS := -L$(KARMALIBPATH) -L$(XLIBPATH) -lkarmaX11 -lkarma -lXext -lX11 -ldl -lm
  else
--CC           = cc $(kcflags) -Wall -pedantic-errors
-+CC           = cc $(kcflags) -Wall -pedantic
- CCnopedantic = cc $(kcflags) -Wall
- CCpp         = c++ $(kcflags)
+-LDFLAGS := -L$(KARMALIBPATH) -lkarmaX11 -lkarma -lXext -lX11 -ldl
++LDFLAGS := -L$(KARMALIBPATH) -lkarmaX11 -lkarma -lXext -lX11 -ldl -lm
  endif
+ 
+ include $(KARMAROOT)/source/lib/makefiles/$(OS)/GNUmakefile.rules
+--- karma-1.7.20/source/lib/makefiles/generic/karmawidgets.orig	2002-08-17 23:32:10.000000000 +0200
++++ karma-1.7.20/source/lib/makefiles/generic/karmawidgets	2011-12-10 08:19:53.511915984 +0100
+@@ -17,10 +17,10 @@ endif
+ 
+ ifdef XLIBPATH
+ LDFLAGS := -L$(KARMALIBPATH) -L$(XLIBPATH) -lkarmagraphics -lkarmaXt \
+-		-lkarmaX11 -lkarma -lXaw -lXt -lXmu -lXext -lX11
++		-lkarmaX11 -lkarma -lXaw -lXt -lXmu -lXext -lX11 -lm
+ else
+ LDFLAGS := -L$(KARMALIBPATH) -lkarmagraphics -lkarmaXt -lkarmaX11 -lkarma \
+-		-lXaw -lXt -lXmu -lXext -lX11
++		-lXaw -lXt -lXmu -lXext -lX11 -lm
+ endif
+ 
+ include $(KARMAROOT)/source/lib/makefiles/$(OS)/GNUmakefile.rules

================================================================
Index: packages/karma/karma.spec
diff -u packages/karma/karma.spec:1.14 packages/karma/karma.spec:1.15
--- packages/karma/karma.spec:1.14	Tue Nov 11 16:24:58 2008
+++ packages/karma/karma.spec	Sat Dec 10 21:55:33 2011
@@ -8,16 +8,15 @@
 Summary:	A powerful programmers toolkit (runtime part)
 Summary(pl.UTF-8):	Potężny zbiór narzędzi dla programistów (część uruchomieniowa)
 Name:		karma
-Version:	1.7
-Release:	6
+Version:	1.7.20
+Release:	1
 License:	LGPL (KarmaLib), GPL (modules)
 Group:		Libraries
-Source0:	ftp://ftp.atnf.csiro.au/pub/software/karma/public/%{name}.src-v%{version}.tar.gz
-# Source0-md5:	ac47c8a489cb6a59945e9b50705e6631
+Source0:	ftp://ftp.atnf.csiro.au/pub/software/karma/%{name}-%{version}-common.tar.bz2
+# Source0-md5:	e60db3b01a007342df3d9b82c1ab029d
 Patch0:		%{name}-makefix.patch
 Patch1:		%{name}-gkh.patch
-Patch2:		%{name}-amd64.patch
-URL:		http://www.atnf.csiro.au/karma/
+URL:		http://www.atnf.csiro.au/computing/software/karma/
 BuildRequires:	/bin/csh
 BuildRequires:	xorg-lib-libX11-devel
 BuildRequires:	xorg-lib-libXaw-devel
@@ -57,10 +56,9 @@
 Część KarmaLib przeznaczona dla programistów.
 
 %prep
-%setup -q -n %{name}
+%setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 %build
 %ifarch %{ix86}
@@ -102,20 +100,23 @@
 
 csh_script/make_build.libs
 %{__make} -C build/${MACHINE_OS}/lib \
+	GCC="%{__cc}" \
+	LDso="%{__cc}" \
 	KOPTIMISE="%{rpmcflags}" \
-	XLIBPATH=/usr/X11R6/%{_lib} \
-	XINCLUDEPATH=/usr/X11R6/include
+	XLIBPATH=/usr/%{_lib} \
+	XINCLUDEPATH=/usr/include
 
 %{__make} -C source/kutil \
+	GCC="%{__cc}" \
 	KOPTIMISE="%{rpmcflags}" \
 	ADMINBINPATH=`pwd`/dist/admin.bin
 
 csh_script/make_build.modules
-cp source/modules/GNUmakefile build/${MACHINE_OS}/modules
 %{__make} -C build/${MACHINE_OS}/modules \
+	GCC="%{__cc}" \
 	KOPTIMISE="%{rpmcflags}" \
-	XLIBPATH=/usr/X11R6/%{_lib} \
-	XINCLUDEPATH=/usr/X11R6/include
+	XLIBPATH=/usr/%{_lib} \
+	XINCLUDEPATH=/usr/include
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -126,7 +127,7 @@
 cp -af csh_script $RPM_BUILD_ROOT%{_libdir}/karma
 cp -rf include/{*.h,Xkw,shader} $RPM_BUILD_ROOT%{_includedir}/karma
 
-rm -f www/{README.lib,update-policy,modules.html}
+%{__rm} www/{README.lib,update-policy,modules.html}
 cp -f doc/modules/Overview www/modules.html
 
 %clean
@@ -138,7 +139,11 @@
 %files
 %defattr(644,root,root,755)
 %doc Release* ToDo doc/{README,update-policy} doc/{modules,widgets}
-%attr(755,root,root) %{_libdir}/lib*.so.*.*
+%attr(755,root,root) %{_libdir}/libkarma.so.*.*
+%attr(755,root,root) %{_libdir}/libkarmaX11.so.*.*
+%attr(755,root,root) %{_libdir}/libkarmaXt.so.*.*
+%attr(755,root,root) %{_libdir}/libkarmagraphics.so.*.*
+%attr(755,root,root) %{_libdir}/libkarmawidgets.so.*.*
 %dir %{_libdir}/karma
 %dir %{_libdir}/karma/bin
 %attr(755,root,root) %{_libdir}/karma/bin/*
@@ -152,7 +157,11 @@
 %files devel
 %defattr(644,root,root,755)
 %doc www
-%attr(755,root,root) %{_libdir}/lib*.so
+%attr(755,root,root) %{_libdir}/libkarma.so
+%attr(755,root,root) %{_libdir}/libkarmaX11.so
+%attr(755,root,root) %{_libdir}/libkarmaXt.so
+%attr(755,root,root) %{_libdir}/libkarmagraphics.so
+%attr(755,root,root) %{_libdir}/libkarmawidgets.so
 %{_includedir}/karma
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -161,6 +170,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.15  2011/12/10 20:55:33  qboosh
+- updated to 0.7.20 (0.7.25 has no sources published)
+- updated makefix,gkh patches, removed obsolete amd64 patch
+
 Revision 1.14  2008/11/11 15:24:58  arekm
 - rel 6; install doesn't preserve symlinks so use cp
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/karma/karma-gkh.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/karma/karma-makefix.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/karma/karma.spec?r1=1.14&r2=1.15&f=u

More information about the pld-cvs-commit mailing list