- kill fvwm -> fvwm2 rename

Changed files:
    fvwm2-varia.patch -> 1.2
    fvwm2.spec -> 1.64

diff --git a/fvwm2-varia.patch b/fvwm2-varia.patch
index 9231de63616ef1ee2afcb508a7c68861a6a49f7c..a7cf6cc34aeba95032b9de2526b25aba73660a24 100644 (file)
--- a/fvwm2-varia.patch
+++ b/fvwm2-varia.patch
@@ -1,45 +1,3 @@
-diff -uNr fvwm-2.5.10.orig/configure fvwm-2.5.10/configure
---- fvwm-2.5.10.orig/configure Fri Mar 19 17:32:50 2004
-+++ fvwm-2.5.10/configure      Thu Sep 16 10:53:42 2004
-@@ -1573,7 +1573,7 @@
- fi
- 
- # Define the identity of the package.
-- PACKAGE=fvwm
-+ PACKAGE=fvwm2
-  VERSION=${version}
- 
- 
-@@ -9124,7 +9124,7 @@
- 
- 
- ALL_LINGUAS="ar de fr sv_SE"
--FVWM_DOMAIN="fvwm"
-+FVWM_DOMAIN="fvwm2"
- FVWMTASKBAR_DOMAIN="FvwmTaskBar"
- FVWMSCRIPT_DOMAIN="FvwmScript"
- ALL_DOMAINS="$FVWM_DOMAIN $FVWMTASKBAR_DOMAIN $FVWMSCRIPT_DOMAIN"
-diff -uNr fvwm-2.5.10.orig/configure.in fvwm-2.5.10/configure.in
---- fvwm-2.5.10.orig/configure.in      Thu Sep 16 10:33:59 2004
-+++ fvwm-2.5.10/configure.in   Thu Sep 16 10:53:44 2004
-@@ -68,7 +68,7 @@
- AC_SUBST(FVWMWORKERSLISTLONG)
- AC_SUBST(MANPAGE_PREAMBLE)
- 
--AM_INIT_AUTOMAKE(fvwm, ${version})
-+AM_INIT_AUTOMAKE(fvwm2, ${version})
- AM_CONFIG_HEADER(config.h)
- 
- dnl installation paths
-@@ -780,7 +780,7 @@
- 
- dnl ******* gettext
- ALL_LINGUAS="ar de fr sv"
--FVWM_DOMAIN="fvwm"
-+FVWM_DOMAIN="fvwm2"
- FVWMTASKBAR_DOMAIN="FvwmTaskBar"
- FVWMSCRIPT_DOMAIN="FvwmScript"
- ALL_DOMAINS="$FVWM_DOMAIN $FVWMTASKBAR_DOMAIN $FVWMSCRIPT_DOMAIN"
 diff -uNr fvwm-2.5.10.orig/fvwm2.menu.m4 fvwm-2.5.10/fvwm2.menu.m4
 --- fvwm-2.5.10.orig/fvwm2.menu.m4     Fri Oct 12 18:51:55 2001
 +++ fvwm-2.5.10/fvwm2.menu.m4  Thu Sep 16 10:43:14 2004
@@ -79,7 +37,7 @@ diff -uNr fvwm-2.5.10.orig/system.fvwm2rc fvwm-2.5.10/system.fvwm2rc
 -ModulePath /usr/X11R6/lib:/usr/X11R6/share/fvwm:/usr/X11R6/lib/X11/fvwm2
 -PixmapPath /usr/X11R6/share/pixmaps:/usr/X11R6/include/X11/pixmaps/:/usr/X11R6/share/icons/:/usr/X11R6/share/icons/mini/:/usr/share/icons/:/usr/share/icons/mini/
 -IconPath   /usr/X11R6/share/pixmaps:/usr/X11R6/include/X11/bitmaps/:/usr/X11R6/share/icons/:/usr/X11R6/share/icons/mini/:/usr/share/icons/:/usr/share/icons/mini/
-+ModulePath /usr/lib:/usr/X11R6/lib:/usr/share/fvwm:/usr/lib/fvwm2
++ModulePath /usr/lib:/usr/X11R6/lib:/usr/share/fvwm:/usr/lib/fvwm
 +PixmapPath /usr/share/pixmaps:/usr/X11R6/include/X11/pixmaps/:/usr/X11R6/share/icons/:/usr/X11R6/share/icons/mini/:/usr/share/icons/:/usr/share/icons/mini/:/usr/share/pixmaps/mini/
 +IconPath   /usr/share/pixmaps:/usr/X11R6/include/X11/bitmaps/:/usr/X11R6/share/icons/:/usr/X11R6/share/icons/mini/:/usr/share/icons/:/usr/share/icons/mini/:/usr/share/pixmaps/mini/
  
@@ -103,17 +61,3 @@ diff -uNr fvwm-2.5.10.orig/system.fvwm2rc fvwm-2.5.10/system.fvwm2rc
  *FvwmButtons(2x1, Title Mail, Icon mail2.xpm, Action 'Exec "-" xterm -title Mutt -geometry 85x35 -e mutt &' )
  
  ############################################################################
---- fvwm-2.5.10/fvwm/Makefile.am~      Thu Sep 16 11:20:26 2004
-+++ fvwm-2.5.10/fvwm/Makefile.am       Thu Sep 16 11:20:26 2004
-@@ -54,10 +54,5 @@
- 
- install-exec-local:
-       @rm -f $(DESTDIR)$(bindir)/fvwm2
--      @$(LN_S) fvwm $(DESTDIR)$(bindir)/fvwm2 || \
--              echo "Minor warning: $(bindir)/fvwm2 symlink was not created"
-+      @cp fvwm $(DESTDIR)$(bindir)/fvwm2
- 
--install-data-local:
--      @rm -f $(DESTDIR)$(mandir)/man1/fvwm2.1
--      @$(LN_S) fvwm.1 $(DESTDIR)$(mandir)/man1/fvwm2.1 || \
--      echo "Minor warning: $(mandir)/man1/fvwm2.1 symlink was not created"

diff --git a/fvwm2.spec b/fvwm2.spec
index 126346131e6dbcb8c564fc2a4227b3a5707e01e0..f7e1d8b46500e3a19ead2742955d7cb944bb6896 100644 (file)
--- a/fvwm2.spec
+++ b/fvwm2.spec
@@ -175,8 +175,6 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-mv $RPM_BUILD_ROOT%{_mandir}/man1/fvwm{,2}.1
-
 install -d \
        $RPM_BUILD_ROOT{%{_sysconfdir},/etc/sysconfig/wmstyle,%{_wmpropsdir}} \
        $RPM_BUILD_ROOT{%{_datadir}/{locale,xsessions},%{_pixmapsdir}/mini}
@@ -217,17 +215,18 @@ rm -rf $RPM_BUILD_ROOT
 %ghost /etc/X11/fvwm2/fvwm2.menu2
 %attr(755,root,root) /etc/sysconfig/wmstyle/*.sh
 %attr(755,root,root) %{_bindir}/[!f]*
+%attr(755,root,root) %{_bindir}/fvwm
 %attr(755,root,root) %{_bindir}/fvwm2
 %attr(755,root,root) %{_bindir}/fvwm-[!p]*
-%dir %{_libdir}/fvwm2
-%attr(755,root,root) %{_libdir}/fvwm2/Fvwm[!DGPW]*
-%attr(755,root,root) %{_libdir}/fvwm2/FvwmD[!e]*
-%attr(755,root,root) %{_libdir}/fvwm2/FvwmGtk
-%attr(755,root,root) %{_libdir}/fvwm2/FvwmP[!e]*
-%attr(755,root,root) %{_libdir}/fvwm2/FvwmW[!i]*
-%attr(755,root,root) %{_libdir}/fvwm2/FvwmWinList
-%dir %{_datadir}/fvwm2
-%{_datadir}/fvwm2/[!p]*
+%dir %{_libdir}/fvwm
+%attr(755,root,root) %{_libdir}/fvwm/Fvwm[!DGPW]*
+%attr(755,root,root) %{_libdir}/fvwm/FvwmD[!e]*
+%attr(755,root,root) %{_libdir}/fvwm/FvwmGtk
+%attr(755,root,root) %{_libdir}/fvwm/FvwmP[!e]*
+%attr(755,root,root) %{_libdir}/fvwm/FvwmW[!i]*
+%attr(755,root,root) %{_libdir}/fvwm/FvwmWinList
+%dir %{_datadir}/fvwm
+%{_datadir}/fvwm/[!p]*
 %{_datadir}/xsessions/%{name}.desktop
 %{_wmpropsdir}/fvwm2.desktop
 %{_mandir}/man1/[!Ff]*.1*
@@ -236,7 +235,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/FvwmP[!e]*.1*
 %{_mandir}/man1/FvwmW[!i]*.1*
 %{_mandir}/man1/FvwmWinList.1*
-%{_mandir}/man1/fvwm2.1*
+%{_mandir}/man1/fvwm.1*
 %{_mandir}/man1/fvwm-[!p]*.1*
 
 %files icons
@@ -247,11 +246,11 @@ rm -rf $RPM_BUILD_ROOT
 %files perl
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/fvwm-perllib
-%attr(755,root,root) %{_libdir}/fvwm2/FvwmDebug
-%attr(755,root,root) %{_libdir}/fvwm2/FvwmGtkDebug
-%attr(755,root,root) %{_libdir}/fvwm2/FvwmPerl
-%attr(755,root,root) %{_libdir}/fvwm2/FvwmWindowMenu
-%{_datadir}/fvwm2/perllib
+%attr(755,root,root) %{_libdir}/fvwm/FvwmDebug
+%attr(755,root,root) %{_libdir}/fvwm/FvwmGtkDebug
+%attr(755,root,root) %{_libdir}/fvwm/FvwmPerl
+%attr(755,root,root) %{_libdir}/fvwm/FvwmWindowMenu
+%{_datadir}/fvwm/perllib
 %{_mandir}/man1/fvwm-perllib.1*
 %{_mandir}/man1/FvwmDebug.1*
 %{_mandir}/man1/FvwmGtkDebug.1*