- up to 6.24

Changed files:
    clips-automake.patch -> 1.2
    clips.spec -> 1.26

diff --git a/clips-automake.patch b/clips-automake.patch
index 5b81ea6b6482ce05543880871173c8ad1077f47b..adb95e8f94f8ed6e64be75a8b18af8300a357e2f 100644 (file)
--- a/clips-automake.patch
+++ b/clips-automake.patch
@@ -1,21 +1,22 @@
-diff -urN clipssrc/AUTHORS clipssrc--/AUTHORS
---- clipssrc/AUTHORS   Thu Jan  1 01:00:00 1970
-+++ clipssrc--/AUTHORS Tue Apr  9 20:38:10 2002
+diff -urN clipssrc/clipssrc/AUTHORS clipssrc/clipssrc--/AUTHORS
+--- clipssrc/clipssrc/AUTHORS  Thu Jan  1 01:00:00 1970
++++ clipssrc/clipssrc--/AUTHORS        Tue Apr  9 20:38:10 2002
 @@ -0,0 +1 @@
 +dummy
-diff -urN clipssrc/ChangeLog clipssrc--/ChangeLog
---- clipssrc/ChangeLog Thu Jan  1 01:00:00 1970
-+++ clipssrc--/ChangeLog       Tue Apr  9 20:38:06 2002
+diff -urN clipssrc/clipssrc/ChangeLog clipssrc/clipssrc--/ChangeLog
+--- clipssrc/clipssrc/ChangeLog        Thu Jan  1 01:00:00 1970
++++ clipssrc/clipssrc--/ChangeLog      Tue Apr  9 20:38:06 2002
 @@ -0,0 +1 @@
 +foo
-diff -urN clipssrc/Makefile.am clipssrc--/Makefile.am
---- clipssrc/Makefile.am       Thu Jan  1 01:00:00 1970
-+++ clipssrc--/Makefile.am     Tue Apr  9 20:37:46 2002
-@@ -0,0 +1,77 @@
+diff -urN clipssrc/clipssrc/Makefile.am clipssrc/clipssrc--/Makefile.am
+--- clipssrc/clipssrc/Makefile.am      Thu Jan  1 01:00:00 1970
++++ clipssrc/clipssrc--/Makefile.am    Tue Apr  9 20:37:46 2002
+@@ -0,0 +1,78 @@
 +lib_LTLIBRARIES = libclips.la
 +bin_PROGRAMS = clips
 +
-+libclips_la_LDFLAGS =  -version-info 6:2:0
++libclips_la_LDFLAGS =  -version-info 6:24:0
++libclips_la_LIBADD =  -lm
 +
 +pkginclude_HEADERS = \
 +      agenda.h analysis.h argacces.h bload.h bmathfun.h bsave.h \
@@ -31,7 +32,7 @@ diff -urN clipssrc/Makefile.am clipssrc--/Makefile.am
 +      evaluatn.h expressn.h exprnbin.h exprnops.h exprnpsr.h \
 +      extnfunc.h factbin.h factbld.h factcmp.h factcom.h \
 +      factfun.h factgen.h facthsh.h factlhs.h factmch.h \
-+      factmngr.h factprt.h factrete.h factrhs.h filecom.h \
++      factmngr.h factprt.h factqpsr.h factqury.h factrete.h factrhs.h filecom.h \
 +      filertr.h generate.h genrcbin.h genrccmp.h genrccom.h \
 +      genrcexe.h genrcfun.h genrcpsr.h globlbin.h globlbsc.h \
 +      globlcmp.h globlcom.h globldef.h globlpsr.h immthpsr.h \
@@ -46,7 +47,7 @@ diff -urN clipssrc/Makefile.am clipssrc--/Makefile.am
 +      prdctfun.h prntutil.h proflfun.h reorder.h reteutil.h \
 +      retract.h router.h rulebin.h rulebld.h rulebsc.h \
 +      rulecmp.h rulecom.h rulecstr.h ruledef.h ruledlt.h \
-+      rulelhs.h rulepsr.h scanner.h setup.h shrtlnkn.h sortfun.h \
++      rulelhs.h rulepsr.h scanner.h setup.h sortfun.h \
 +      strngfun.h strngrtr.h symblbin.h symblcmp.h symbol.h \
 +      sysdep.h textpro.h tmpltbin.h tmpltbsc.h tmpltcmp.h \
 +      tmpltdef.h tmpltfun.h tmpltlhs.h tmpltpsr.h tmpltrhs.h \
@@ -66,7 +67,7 @@ diff -urN clipssrc/Makefile.am clipssrc--/Makefile.am
 +      expressn.c exprnbin.c exprnops.c exprnpsr.c extnfunc.c \
 +      factbin.c factbld.c factcmp.c factcom.c factfun.c \
 +      factgen.c facthsh.c factlhs.c factmch.c factmngr.c \
-+      factprt.c factrete.c factrhs.c filecom.c filertr.c \
++      factprt.c factqpsr.c factqury.c factrete.c factrhs.c filecom.c filertr.c \
 +      generate.c genrcbin.c genrccmp.c genrccom.c genrcexe.c \
 +      genrcfun.c genrcpsr.c globlbin.c globlbsc.c globlcmp.c \
 +      globlcom.c globldef.c globlpsr.c immthpsr.c incrrset.c \
@@ -85,27 +86,27 @@ diff -urN clipssrc/Makefile.am clipssrc--/Makefile.am
 +      strngrtr.c symblbin.c symblcmp.c symbol.c sysdep.c \
 +      textpro.c tmpltbin.c tmpltbsc.c tmpltcmp.c tmpltdef.c \
 +      tmpltfun.c tmpltlhs.c tmpltpsr.c tmpltrhs.c tmpltutl.c \
-+      userdata.c utility.c watch.c
++      userdata.c userfunctions.c utility.c watch.c
 +
 +clips_SOURCES = main.c
 +clips_LDADD = -lclips -lm
-diff -urN clipssrc/NEWS clipssrc--/NEWS
---- clipssrc/NEWS      Thu Jan  1 01:00:00 1970
-+++ clipssrc--/NEWS    Tue Apr  9 20:37:58 2002
+diff -urN clipssrc/clipssrc/NEWS clipssrc/clipssrc--/NEWS
+--- clipssrc/clipssrc/NEWS     Thu Jan  1 01:00:00 1970
++++ clipssrc/clipssrc--/NEWS   Tue Apr  9 20:37:58 2002
 @@ -0,0 +1 @@
 +foobar
-diff -urN clipssrc/README clipssrc--/README
---- clipssrc/README    Thu Jan  1 01:00:00 1970
-+++ clipssrc--/README  Tue Apr  9 20:38:01 2002
+diff -urN clipssrc/clipssrc/README clipssrc/clipssrc--/README
+--- clipssrc/clipssrc/README   Thu Jan  1 01:00:00 1970
++++ clipssrc/clipssrc--/README Tue Apr  9 20:38:01 2002
 @@ -0,0 +1 @@
 +foobarbaz
-diff -urN clipssrc/configure.ac clipssrc--/configure.ac
---- clipssrc/configure.ac      Thu Jan  1 01:00:00 1970
-+++ clipssrc--/configure.ac    Tue Apr  9 20:37:46 2002
+diff -urN clipssrc/clipssrc/configure.ac clipssrc/clipssrc--/configure.ac
+--- clipssrc/clipssrc/configure.ac     Thu Jan  1 01:00:00 1970
++++ clipssrc/clipssrc--/configure.ac   Tue Apr  9 20:37:46 2002
 @@ -0,0 +1,27 @@
 +# Process this file with autoconf to produce a configure script.
-+AC_INIT(clips, 6.2)
-+AM_INIT_AUTOMAKE(clips, 6.2)
++AC_INIT(clips, 6.24)
++AM_INIT_AUTOMAKE(clips, 6.24)
 +AC_CONFIG_SRCDIR([agenda.c])
 +AM_CONFIG_HEADER([config.h])
 +

diff --git a/clips.spec b/clips.spec
index 982fa21a44aa472eb8660fc847929acfdcd4120b..49a0e8da1743c5324a6f15913363064f780d6592 100644 (file)
--- a/clips.spec
+++ b/clips.spec
@@ -1,33 +1,31 @@
 Summary:       CLIPS - a productive development and delivery expert system tool
 Summary(pl.UTF-8):     CLIPS - narzędzie do tworzenia i wdrażania systemów eksperckich
 Name:          clips
-Version:       6.2
-Release:       3
+Version:       6.24
+Release:       1
 License:       Public Domain
 Group:         Development/Languages
 Source0:       http://www.ghg.net/clips/download/source/clipssrc.tar.Z
-# Source0-md5: de2bddd67d3f82f23fb6c1bef051b544
+# Source0-md5: ccba9d912375e57a1b7d9eba12da4198
 Source1:       http://www.ghg.net/clips/download/documentation/3CCP.pdf
 # Source1-md5: a6a60733af08f9e9e6d0928272ad4dd9
 Source2:       http://www.ghg.net/clips/download/documentation/abstract.pdf
 # Source2-md5: cd3ecddc4e538b8af0e5cf08ab7fd89c
 Source3:       http://www.ghg.net/clips/download/documentation/apg.pdf
-# Source3-md5: 77a051086c3be543f507e8b1f77f7077
+# Source3-md5: fae2267d96fb95603345e91c9990caaa
 Source4:       http://www.ghg.net/clips/download/documentation/arch5-1.pdf
 # Source4-md5: 9a13d2ed18fe6ab67902d5bce29957cb
 Source5:       http://www.ghg.net/clips/download/documentation/bpg.pdf
-# Source5-md5: 15190fdc0895356ab347e1dd41bb6aa7
+# Source5-md5: 63891971aa782dc67c2de0579647247e
 Source6:       http://www.ghg.net/clips/download/documentation/ig.pdf
-# Source6-md5: ab5d7fb340c3be4dc533831dc7d8f1b5
+# Source6-md5: 89beca5caa08b30d8285cca7f1df1d26
 Source7:       http://www.ghg.net/clips/download/documentation/usrguide.pdf
-# Source7-md5: f2da81e30713f24d8b94c2822fc7704a
+# Source7-md5: 44e54697a8acf3509bc4ca51d88b65bd
 Source8:       http://www.ghg.net/clips/download/source/%{name}.hlp
-# Source8-md5: e6429bcd668b085038179cf54764436a
-# from http://www.ghg.net/clips/download/executables/examples/
-Source9:       %{name}-examples-%{version}.tar.gz
-# Source9-md5: 83dfad948a07267487661973435d72e9
+# Source8-md5: 55f662f8aa8400aff8bf5a5cb882f708
+Source9:       http://www.ghg.net/clips/download/executables/examples/AllExamples.tar.Z
+# Source9-md5: f5c02b997199f3ede779b8502af2ba09
 Patch0:                %{name}-automake.patch
-Patch1:                %{name}-as-needed.patch
 URL:           http://www.ghg.net/clips/CLIPS.html
 BuildRequires: autoconf
 BuildRequires: automake
@@ -85,14 +83,11 @@ Statyczne biblioteki dla programów używających wbudowanego środowiska
 CLIPSa.
 
 %prep
-%setup -q -T -c
-tar zxf %{SOURCE0}
+%setup -q -T -c -a0 -a9
 %patch0 -p0
-tar zxf %{SOURCE9}
-%patch1 -p1
 
 %build
-cd clipssrc
+cd clipssrc/clipssrc/
 rm -f missing
 %{__libtoolize}
 %{__aclocal}
@@ -110,7 +105,7 @@ echo '#define HELP_DEFAULT "%{_datadir}/misc/%{name}.hlp"' >> usrsetup.h
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_datadir}/misc,%{_examplesdir}/%{name}-%{version}}
 
-%{__make} -C clipssrc install \
+%{__make} -C clipssrc/clipssrc install \
        DESTDIR=$RPM_BUILD_ROOT
 
 install %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} \
@@ -118,9 +113,9 @@ install %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} \
 
 install %{SOURCE8} $RPM_BUILD_ROOT%{_datadir}/misc/%{name}.hlp
 
-cp -r examples/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
+cp -r Examples/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 
-mv readme.txt COPYING
+cp -f clipssrc/readme.txt COPYING
 
 %clean
 rm -rf $RPM_BUILD_ROOT