rpms/clips/F-7 clips.spec,1.8,1.9

[Rick L. Vinyard, Jr. (rvinyard)]

Author: rvinyard

Update of /cvs/extras/rpms/clips/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7882

Modified Files:
	clips.spec 
Log Message:



Index: clips.spec
===================================================================
RCS file: /cvs/extras/rpms/clips/F-7/clips.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- clips.spec	2 Feb 2007 19:19:53 -0000	1.8
+++ clips.spec	25 Aug 2007 19:13:39 -0000	1.9
@@ -1,9 +1,9 @@
 Summary:	  CLIPS language for developing expert systems
 Name:		  clips
 Version:	  6.24
-Release:	  22%{?dist}
+Release:	  23%{?dist}
 Url:		  http://www.ghg.net/clips/download/source/
-License:	  GPL
+License:	  GPLv2
 Group:		  Development/Tools
 Source0:	  http://www.ghg.net/clips/download/source/clipssrc.tar.Z
 Source1:	  http://www.ghg.net/clips/download/source/x-prjct.tar.Z
@@ -22,7 +22,9 @@
 Source14:         http://www.ghg.net/clips/download/other/Bug_Fixes/objrtmch.c
 Source15:	  http://www.ghg.net/clips/download/other/FunctionContext.zip
 Source16:	  http://www.ghg.net/clips/download/other/Bug_Fixes/DR0873.txt
-Patch0:	 	  clips-6.24-linux.patch.bz2
+Source17:	  xclips.desktop
+Patch0:	 	  clips-6.24-linux.patch
+Patch1:	 	  clips-6.24-time-sysdep.c.patch
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	  ncurses-devel libXt-devel libXext-devel libXmu-devel libXaw-devel xorg-x11-server-Xorg xorg-x11-proto-devel xorg-x11-xbitmaps desktop-file-utils
 
@@ -82,7 +84,8 @@
 mv x-prjct/xinterface clipssrc/
 mv x-prjct/color clipssrc/
 mv clipssrc/clipssrc clipssrc/clips
-%patch0 -p0 
+%patch0 -p0
+%patch1 -p0
 #move in the function context patch files
 mv envrnmnt.h clipssrc/clips
 mv envrnmnt.c clipssrc/clips
@@ -94,13 +97,14 @@
 chmod a-x clipssrc/*/*.h clipssrc/*/*.c
 chmod a-x Examples/*.clp
 chmod a-x Examples/Cholesterol/*
-chmod u+x clipssrc/configure
+chmod u+x clipssrc/autogen.sh
 for i in %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7} %{SOURCE8} %{SOURCE9} %{SOURCE16}; do
  cp $i .
 done
 
 %build
 cd clipssrc
+./autogen.sh
 %configure --disable-static
 %{__make} %{?_smp_mflags}
 
@@ -114,8 +118,8 @@
 desktop-file-install --vendor fedora \
 	--dir %{buildroot}%{_datadir}/applications \
 	--add-category X-Fedora \
-	xclips.desktop
-%{__make} DESTDIR=%{buildroot} install
+	%{SOURCE17}
+%{__make} install DESTDIR=%{buildroot} INSTALL="%{__install} -p" 
 find %{buildroot} -type f -name "*.la" -exec rm -f {} ';'
 
 %clean
@@ -162,6 +166,16 @@
 %doc ig.pdf
  
 %changelog
+* Sat Aug 25 2007 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> 6.24-23
+- Added patch to fix time function; closes bug 249995
+- Fixed the version in the xclips.desktop file and removed it from the linux patch
+- Added the linux patch and xclips.desktop files to cvs
+- Changed the linux patch from a bzip file to a normal patch file
+- Removed the pre-generated autotools files from the linux patch
+- Added running of autogen.sh prior to running configure to build autotools files
+- Added timestamp preservation to install
+- Updated (not changed) license to new tag GPLv2
+
 * Fri Feb 02 2007 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> 6.24-22
 - Bump release to build FC-5 and devel against new patch