- version 1.0.7-7

- new DESTDIR.patch

Changed files:
    icewm-DESTDIR.patch -> 1.4
    icewm-time.patch -> 1.2
    icewm.spec -> 1.31

diff --git a/icewm-DESTDIR.patch b/icewm-DESTDIR.patch
index d0651e1ccd9cae8137f5f565058208e57b28a270..b1f2ba36d89b650e1038ded3b31136e7968a480c 100644 (file)
--- a/icewm-DESTDIR.patch
+++ b/icewm-DESTDIR.patch
@@ -1,7 +1,19 @@
-diff -urN icewm-1.0.6.org/Makefile.in icewm-1.0.6/Makefile.in
---- icewm-1.0.6.org/Makefile.in        Wed Jan 17 20:34:20 2001
-+++ icewm-1.0.6/Makefile.in    Wed Jan 17 20:35:33 2001
-@@ -67,37 +67,37 @@
+--- icewm-1.0.7/po/Makefile.orig       Sun Mar 25 01:54:17 2001
++++ icewm-1.0.7/po/Makefile    Sun Mar 25 01:53:08 2001
+@@ -23,8 +23,8 @@
+         LANG=`echo $$c|sed -e 's/.mo//'` ; \
+         MSGDIR="$(LOCDIR)/$$LANG/LC_MESSAGES"; \
+         echo Installing language: $$LANG ; \
+-        $(INSTALLDIR) $$MSGDIR; \
+-        $(INSTALLLIB) $$c $$MSGDIR/$(PACKAGE).mo; \
++        $(INSTALLDIR) $(DESTDIR)$$MSGDIR; \
++        $(INSTALLLIB) $$c $(DESTDIR)$$MSGDIR/$(PACKAGE).mo; \
+       done
+ 
+ clean:
+--- icewm-1.0.7/Makefile.in.orig       Sun Mar 25 01:39:53 2001
++++ icewm-1.0.7/Makefile.in    Sun Mar 25 01:46:49 2001
+@@ -62,37 +62,37 @@
  # Makefile TABS *SUCK*
  install-base: base
        @echo ------------------------------------------
@@ -53,7 +65,7 @@ diff -urN icewm-1.0.6.org/Makefile.in icewm-1.0.6/Makefile.in
                      done;\
                  fi;\
              done;\
-@@ -106,24 +106,24 @@
+@@ -101,9 +101,9 @@
  
  install-docs: docs $(LSM)
        @echo ------------------------------------------
@@ -66,18 +78,16 @@ diff -urN icewm-1.0.6.org/Makefile.in icewm-1.0.6/Makefile.in
  
  install-nls: nls
        @echo ------------------------------------------
--      @cd po ; ${MAKE} install
-+      @cd po ; ${MAKE} DESTDIR=$(DESTDIR) install
+@@ -111,12 +111,12 @@
  
- install-guievents: guievents
+ install-%: %
        @echo ------------------------------------------
-       @echo Installing GUI event support to $(BINDIR)
+-      @echo Installing $* to $(BINDIR)
 -      @$(INSTALLDIR) $(BINDIR)
+-      @$(INSTALLBIN) src/$* $(BINDIR)
++      @echo Installing $* to $(DESTDIR)$(BINDIR)
 +      @$(INSTALLDIR) $(DESTDIR)$(BINDIR)
-       @for a in $(GUIEVENTSFILES) ; do \
--            $(INSTALLBIN) $$a $(BINDIR); \
-+            $(INSTALLBIN) $$a $(DESTDIR)$(BINDIR); \
-         done
++      @$(INSTALLBIN) src/$* $(DESTDIR)$(BINDIR)
  
  install-gnome: gnome
        @echo ------------------------------------------
@@ -87,9 +97,8 @@ diff -urN icewm-1.0.6.org/Makefile.in icewm-1.0.6/Makefile.in
 +      @echo Installing icewm-gnome to $(DESTDIR)$(WMPROPDIR)
 +      @$(INSTALLDIR) $(DESTDIR)$(WMPROPDIR)
 +      @$(INSTALLLIB) lib/IceWM.desktop $(DESTDIR)$(WMPROPDIR)
-diff -urN icewm-1.0.6.org/configure.in icewm-1.0.6/configure.in
---- icewm-1.0.6.org/configure.in       Wed Jan 17 20:34:20 2001
-+++ icewm-1.0.6/configure.in   Wed Jan 17 20:34:27 2001
+--- icewm-1.0.7/configure.in.orig      Sun Mar 25 01:49:37 2001
++++ icewm-1.0.7/configure.in   Sun Mar 25 01:52:02 2001
 @@ -66,7 +66,7 @@
  AC_FUNC_SELECT_ARGTYPES
  
@@ -99,17 +108,5 @@ diff -urN icewm-1.0.6.org/configure.in icewm-1.0.6/configure.in
  
  dnl Checking for X11
  AC_PATH_XTRA
-diff -urN icewm-1.0.6.org/po/Makefile icewm-1.0.6/po/Makefile
---- icewm-1.0.6.org/po/Makefile        Wed Jan 17 20:34:20 2001
-+++ icewm-1.0.6/po/Makefile    Wed Jan 17 20:34:27 2001
-@@ -23,8 +23,8 @@
-         LANG=`echo $$c|sed -e 's/.mo//'` ; \
-         MSGDIR="$(LOCDIR)/$$LANG/LC_MESSAGES"; \
-         echo Installing language: $$LANG ; \
--        $(INSTALLDIR) $$MSGDIR; \
--        $(INSTALLBIN) $$c $$MSGDIR/$(PACKAGE).mo; \
-+        $(INSTALLDIR) $(DESTDIR)$$MSGDIR; \
-+        $(INSTALLBIN) $$c $(DESTDIR)$$MSGDIR/$(PACKAGE).mo; \
-       done
  
- clean:
+

diff --git a/icewm-time.patch b/icewm-time.patch
index f2deffba9f125ab410b8047ec82371367fffe696..48c71f885b955df89ade39a2466a25702731d65c 100644 (file)
--- a/icewm-time.patch
+++ b/icewm-time.patch
@@ -1,6 +1,6 @@
-diff -urN icewm-1.0.6/src/aclock.cc icewm-1.0.6-florin/src/aclock.cc
---- icewm-1.0.6/src/aclock.cc  Sun Jan 14 22:49:39 2001
-+++ icewm-1.0.6-florin/src/aclock.cc   Mon Feb 19 19:42:05 2001
+diff -urN icewm-1.0.7/src/aclock.cc icewm-1.0.7-florin/src/aclock.cc
+--- icewm-1.0.7/src/aclock.cc  Sun Jan 14 22:49:39 2001
++++ icewm-1.0.7-florin/src/aclock.cc   Mon Feb 19 19:42:05 2001
 @@ -8,6 +8,7 @@
  #include "config.h"
  #include "ylib.h"
@@ -9,9 +9,9 @@ diff -urN icewm-1.0.6/src/aclock.cc icewm-1.0.6-florin/src/aclock.cc
  
  #include "yapp.h"
  #include "prefs.h"
-diff -urN icewm-1.0.6/src/apppstatus.cc icewm-1.0.6-florin/src/apppstatus.cc
---- icewm-1.0.6/src/apppstatus.cc      Sun Jan 14 22:49:39 2001
-+++ icewm-1.0.6-florin/src/apppstatus.cc       Mon Feb 19 19:46:42 2001
+diff -urN icewm-1.0.7/src/apppstatus.cc icewm-1.0.7-florin/src/apppstatus.cc
+--- icewm-1.0.7/src/apppstatus.cc      Sun Jan 14 22:49:39 2001
++++ icewm-1.0.7-florin/src/apppstatus.cc       Mon Feb 19 19:46:42 2001
 @@ -12,6 +12,7 @@
  
  #include "ylib.h"

diff --git a/icewm.spec b/icewm.spec
index 0330272f116a3e0f6dbe9150730fab41b758c99f..40cc030314d56adbe8865e1b46e8552afd2828f4 100644 (file)
--- a/icewm.spec
+++ b/icewm.spec
@@ -1,14 +1,14 @@
 Summary:       IceWM X11 Window Manager
 Summary(pl):   IceWM - Mened¿er okienek X11
 Name:          icewm
-Version:       1.0.6
-Release:       2
+Version:       1.0.7
+Release:       1
 License:       GPL
 Group:         X11/Window Managers
 Group(es):     X11/Administraadores De Ventanas
 Group(fr):     X11/Gestionnaires De Fenêtres
 Group(pl):     X11/Zarz±dcy Okien
-Source0:       ftp://download.sourceforge.net/pub/sourceforge/icewm/%{name}-%{version}-4.tar.bz2
+Source0:       ftp://download.sourceforge.net/pub/sourceforge/icewm/%{name}-%{version}-7.tar.bz2
 Source1:       IceWM.desktop
 Patch0:                icewm-DESTDIR.patch
 Patch1:                %{name}-time.patch