- up to 7.15.00

Changed files:
    icmake-bootstrap.patch -> 1.2
    icmake-warnings.patch -> 1.2
    icmake.spec -> 1.22

diff --git a/icmake-bootstrap.patch b/icmake-bootstrap.patch
deleted file mode 100644 (file)
index 98b7844..0000000
--- a/icmake-bootstrap.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- bootstrap.orig     Tue Nov 23 10:19:34 1999
-+++ bootstrap  Tue Nov 23 10:18:45 1999
-@@ -8,7 +8,7 @@
- 
- echo    Building the runtime-library in ./rss
- cd rss
--gcc -c -O -DHAVE_GLOB *.c
-+gcc $CFLAGS -c -DHAVE_GLOB *.c
- ar rsv libicrss.a *.o
- rm *.o
- cd ..
-@@ -18,23 +18,23 @@
- 
- echo Creating icmake
- cd make
--gcc -O -DHAVE_GLOB -o ../bin/icmake *.c ../rss/libicrss.a
-+gcc $CFLAGS -DHAVE_GLOB -o ../bin/icmake *.c ../rss/libicrss.a
- 
- echo Creating icm-pp
- cd ../pp
--gcc -O -DHAVE_GLOB -o ../bin/icm-pp *.c ../rss/libicrss.a
-+gcc $CFLAGS -DHAVE_GLOB -o ../bin/icm-pp *.c ../rss/libicrss.a
- 
- echo Creating icm-comp
- cd ../comp
--gcc -O -DHAVE_GLOB -o ../bin/icm-comp *.c ../rss/libicrss.a
-+gcc $CFLAGS -DHAVE_GLOB -o ../bin/icm-comp *.c ../rss/libicrss.a
- 
- echo Creating icm-exec
- cd ../exec
--gcc -O -DHAVE_GLOB -o ../bin/icm-exec *.c ../rss/libicrss.a
-+gcc $CFLAGS -DHAVE_GLOB -o ../bin/icm-exec *.c ../rss/libicrss.a
- cd ../un
- 
- echo Creating icmun
--gcc -O -DHAVE_GLOB -o ../bin/icmun *.c ../rss/libicrss.a
-+gcc $CFLAGS -DHAVE_GLOB -o ../bin/icmun *.c ../rss/libicrss.a
- cd ..  
- 
- echo Stripping the binaries

diff --git a/icmake-warnings.patch b/icmake-warnings.patch
deleted file mode 100644 (file)
index 3fba34f..0000000
--- a/icmake-warnings.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- exec/icm-exec.c.orig       Tue Nov 23 11:01:28 1999
-+++ exec/icm-exec.c    Tue Nov 23 11:00:48 1999
-@@ -34,7 +34,7 @@
- 
- #include "icm-exec.h"
- 
--void main (argc, argv, envp)
-+main (argc, argv, envp)
- int argc;
- char **argv;
- char **envp;
---- pp/icm-pp.c.orig   Tue Nov 23 11:01:49 1999
-+++ pp/icm-pp.c        Tue Nov 23 10:59:11 1999
-@@ -35,7 +35,7 @@
- 
- #include "icm-pp.h"
- 
--void main (int argc, char **argv)
-+main (int argc, char **argv)
- {
-     register char
-         *progname;

diff --git a/icmake.spec b/icmake.spec
index 190eaf485a9d8c3f04b71fc7ae2bf7ff8f988ada..bd6695f29ef5d7631ed2084376e18ab715dd97fc 100644 (file)
--- a/icmake.spec
+++ b/icmake.spec
@@ -1,17 +1,14 @@
 Summary:       Icmake - an Intelligent C-like Maker
 Summary(pl.UTF-8):     Icmake - inteligentny C-podobny "maker"
 Name:          icmake
-Version:       6.22
-Release:       4
-Group:         Development/Building
+Version:       7.15.00
+Release:       1
 License:       GPL
-Source0:       ftp://ftp.rug.nl/contrib/frank/software/linux/icmake/%{name}-%{version}.tgz
-# Source0-md5: dff5bb7e5570aaff9adff1bc1f9f630a
-Source1:       ftp://ftp.rug.nl/contrib/frank/software/linux/icmake/%{name}.doc
-# Source1-md5: 1b62cf6521101dbe53df87bc3a5e84d6
-Patch0:                %{name}-bootstrap.patch
-Patch1:                %{name}-warnings.patch
-URL:           ftp://ftp.rug.nl/contrib/frank/software/linux/icmake/icmake.lsm
+Group:         Development/Building
+Source0:       http://downloads.sourceforge.net/icmake/%{name}_%{version}.orig.tar.gz
+# Source0-md5: 3f23dcd960b03fd5b808f29372980dbc
+URL:           http://icmake.sourceforge.net/
+BuildRequires: bash
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -29,26 +26,46 @@ może być używany równie dobrze do tworzenia programów z równym
 powodzeniem jak do wykonywania zadań administracyjnych.
 
 %prep
-%setup -q -n icmake
-%patch0 -p0
-%patch1 -p0
-install %{SOURCE1} .
+%setup -q
+sed -i -e 's#gcc#%{__cc}#g' icm_*
+sed -i -e 's#-O2 -g#%{rpmcflags} %{rpmcppflags}#g' icm_*
+sed -i -e 's#/lib/#/%{_lib}/#g' INSTALL.im
 
 %build
-CFLAGS="%{rpmcflags}" /bin/sh bootstrap
+./icm_bootstrap /
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-install -d $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man1}
-install bin/* $RPM_BUILD_ROOT%{_bindir}
-install doc/icmake.1 $RPM_BUILD_ROOT%{_mandir}/man1
+./icm_install progs $RPM_BUILD_ROOT
+./icm_install scripts $RPM_BUILD_ROOT
+./icm_install skel $RPM_BUILD_ROOT
+./icm_install man $RPM_BUILD_ROOT
+./icm_install doc $RPM_BUILD_ROOT
+./icm_install etc $RPM_BUILD_ROOT
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc CHANGES icmake.doc doc/icmake.ps
-%attr(755,root,root) %{_bindir}/icm*
-%{_mandir}/man1/*
+%doc changelog doc/icmake.ps doc/icmake.doc
+%dir %{_sysconfdir}/icmake
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/icmake/icmstart.rc
+%attr(755,root,root) %{_bindir}/icmake
+%attr(755,root,root) %{_bindir}/icmbuild
+%attr(755,root,root) %{_bindir}/icmstart
+%attr(755,root,root) %{_bindir}/icmun
+%dir %{_libdir}/%{name}
+%attr(755,root,root) %{_libdir}/%{name}/icm-comp
+%attr(755,root,root) %{_libdir}/%{name}/icm-exec
+%attr(755,root,root) %{_libdir}/%{name}/icm-pp
+%dir %{_datadir}/%{name}
+%dir %{_datadir}/%{name}/parser
+%{_datadir}/%{name}/parser/grammar
+%dir %{_datadir}/%{name}/parser/gramspec
+%dir %{_datadir}/%{name}/parser/gramspec/*.*
+%attr(755,root,root) %{_datadir}/%{name}/parser/gramspec/grambuild
+%{_datadir}/%{name}/[^p]*
+%{_mandir}/man1/ic*.1*
+%{_mandir}/man7/ic*.7*