- updated to 2.5.5, updated paths patch, removed obsolete ac patch

- updated paths in RunWM (in source) and system.fvwm2rc (in spec)
- added some strict BRs/bconds to avoid entropy (fribidi, gnome, stroke, xft)
- fixed wmpropsdir definition (must be the same as in XFree86.spec)
- separated perllib and dependent modules to perl subpackage
- removed --disable-package-subdirs (caused too much mess in libdir/datadir
  and --disable-xinerama (why it was disabled?)

Changed files:
    fvwm2-ac.patch -> 1.2
    fvwm2-paths.patch -> 1.3
    fvwm2.RunWM -> 1.2
    fvwm2.spec -> 1.36

diff --git a/fvwm2-ac.patch b/fvwm2-ac.patch
deleted file mode 100644 (file)
index b8faad0..0000000
--- a/fvwm2-ac.patch
+++ /dev/null
@@ -1,48 +0,0 @@
---- fvwm-2.5.0/configure.in~   Sat Nov 23 02:40:14 2002
-+++ fvwm-2.5.0/configure.in    Sat Nov 23 02:43:20 2002
-@@ -528,7 +528,7 @@
- 
- dnl Check for standard functions that we have replacements for.
- AC_REPLACE_FUNCS(gethostname strcasecmp strncasecmp strdup strerror usleep atexit)
--AC_SUBST(LIBOBJS)
-+AC_LIBOBJ
- 
- dnl If we do not have atexit(), then check for on_exit()
- if test $ac_cv_func_atexit = no; then
---- fvwm-2.5.0/configure.in~   Sat Nov 23 02:59:52 2002
-+++ fvwm-2.5.0/configure.in    Sat Nov 23 03:05:17 2002
-@@ -306,24 +306,8 @@
- with_readline=no
- problem_readline=": Both termcap and ncurses disabled"
- 
--smr_ARG_WITHLIB(termcap, , to accomplish readline)
--if test "$with_termcap" != "no"; then
--  dnl Forget cached values, so user can re-run configure
--  $UNSET ac_cv_header_readline_history_h
--  $UNSET ac_cv_lib_readline_readline
--  AC_MSG_CHECKING([with termcap])
--  smr_CHECK_LIB(readline, , line editing/history, readline, readline/history.h,
--    $termcap_LIBS)
--  if test "$readline_LIBS"; then
--    with_readline=yes
--    readline_LIBS="$readline_LIBS $termcap_LIBS"
--    AC_DEFINE(HAVE_READLINE)
--  fi
--fi
- smr_ARG_WITHLIB(ncurses, , to accomplish readline)
- if test "$with_ncurses" != "no" -a ! "$readline_LIBS"; then
--  # We couldn't use readline with termcap; try with ncurses?
--  dnl Doesn't this seem a hacky way to do this??
-   dnl unset cached values from last check...
-   $UNSET ac_cv_header_readline_history_h
-   $UNSET ac_cv_lib_readline_readline
---- fvwm-2.5.0/libs/Makefile.am~       Tue Oct  9 22:05:40 2001
-+++ fvwm-2.5.0/libs/Makefile.am        Sat Nov 23 03:24:20 2002
-@@ -13,6 +13,6 @@
-       XError.c fvwmsignal.c GetFont.c Strings.c wild.c safemalloc.c \
-       Pointer.c debug.c Grab.c ClientMsg.c fvwmrect.c Cursor.c
- 
--libfvwm_a_LIBADD = @LIBOBJS@ @ALLOCA@
-+## libfvwm_a_LIBADD = @LIBOBJS@ @ALLOCA@
- 
- INCLUDES = -I$(top_srcdir) $(xpm_CFLAGS) $(X_CFLAGS)

diff --git a/fvwm2-paths.patch b/fvwm2-paths.patch
index 9559e46f171c129eeb719f90cde004c3837bd8c6..b9fecb6a689c5abd56f06b972b1187baab84ad8a 100644 (file)
--- a/fvwm2-paths.patch
+++ b/fvwm2-paths.patch
@@ -1,22 +1,22 @@
---- fvwm-2.4.0/configure.in.orig       Tue Jul  3 09:58:15 2001
-+++ fvwm-2.4.0/configure.in    Mon Aug 20 03:34:00 2001
+--- fvwm-2.5.5/configure.in.orig       Tue Jul  3 09:58:15 2001
++++ fvwm-2.5.5/configure.in    Mon Aug 20 03:34:00 2001
 @@ -5,7 +5,7 @@
- AM_INIT_AUTOMAKE(fvwm, 2.4.0)
  AM_CONFIG_HEADER(config.h)
  
+ dnl installation paths
 -FVWM_MODULESUBDIR=/${PACKAGE}/${VERSION}
 +FVWM_MODULESUBDIR=/${PACKAGE}
  FVWM_DATASUBDIR=/${PACKAGE}
  
  AC_ARG_ENABLE(package-subdirs,
 @@ -13,8 +13,8 @@
-   [if test $enableval = no; then FVWM_MODULESUBDIR=""; FVWM_DATASUBDIR=""; fi],
-   [])
+   [if test x"$enableval" = xno; then FVWM_MODULESUBDIR=""; FVWM_DATASUBDIR="";
+   fi], [])
  
--FVWM_MODULEDIR='${libexecdir}'$FVWM_MODULESUBDIR
--FVWM_DATADIR='${datadir}'$FVWM_DATASUBDIR
-+FVWM_MODULEDIR='${libdir}'$FVWM_MODULESUBDIR
+-FVWM_MODULEDIR='${libexecdir}'"$FVWM_MODULESUBDIR"
+-FVWM_DATADIR='${datadir}'"$FVWM_DATASUBDIR"
++FVWM_MODULEDIR='${libdir}'"$FVWM_MODULESUBDIR"
 +FVWM_DATADIR='${pkgdatadir}'
+ FVWM_PERLLIBDIR='${datadir}'"$FVWM_DATASUBDIR/perllib"
  FVWM_CONFDIR='${sysconfdir}'dnl used _only_ to search for system.fvwm2rc
  
- AC_SUBST(FVWM_MODULEDIR)

diff --git a/fvwm2.RunWM b/fvwm2.RunWM
index 09ce1ee2c36789b2dd5019bfd1c1480a7395ba1f..e5f4b8824c280b7dda9336f79c931093b17bf2c0 100644 (file)
--- a/fvwm2.RunWM
+++ b/fvwm2.RunWM
@@ -25,11 +25,11 @@ fi
 for FVWMVER in 2 95 95-2; do
        if [ -n "$(which fvwm${FVWMVER})" ]; then
                # if this works, we stop here
-               eval "exec /usr/X11R6/bin/fvwm${FVWMVER} ${FVWMOPTIONS}"
+               eval "exec /usr/bin/fvwm${FVWMVER} ${FVWMOPTIONS}"
        fi
 done
 cat >&2 <<EOF
  WARNING: You selected Fvwm2 as your window manager, but your installation
- does not appear to be functional. The executable /usr/X11R6/bin/fvwm2 was 
- not found on your system.
+ does not appear to be functional. The executable /usr/bin/fvwm2 was not
+ found on your system.
 EOF

diff --git a/fvwm2.spec b/fvwm2.spec
index 02104f1937e30b2f577e0e6a1d8237edab08ab52..537bd682f32d44c075557f2fe09d3126e54a2dd0 100644 (file)
--- a/fvwm2.spec
+++ b/fvwm2.spec
@@ -1,3 +1,13 @@
+#
+# TODO: more updates in system.fvwm2rc (see warnings on run)
+#
+# Conditional build:
+# _with_fribidi                - with bidirectional text support
+# _with_gnome          - with gnome-libs
+# _without_stroke      - without mouse strokes (gestures) support
+# _without_xft         - without Xft (1 or 2) support
+#
+%include       /usr/lib/rpm/macros.perl
 Summary:       An improved version of the FVWM X-based window manager
 Summary(de):   F(?) Virtual Window Manager
 Summary(es):   Administrador de ventanas semejante al mwm
@@ -8,8 +18,8 @@ Summary(pl):   Ulepszona wersja zarz
 Summary(pt_BR):        Gerenciador de janelas semelhante ao mwm
 Summary(ru):   ÷ÉÒÔÕÁÌØÎÙÊ ÏËÏÎÎÙÊ ÍÅÎÅÄÖÅÒ F(?)
 Name:          fvwm2
-Version:       2.5.0
-Release:       2
+Version:       2.5.5
+Release:       1
 License:       GPL
 Group:         X11/Window Managers
 Source0:       ftp://ftp.fvwm.org/pub/fvwm/version-2/fvwm-%{version}.tar.bz2
@@ -19,21 +29,26 @@ Source3:    %{name}-system.%{name}rc.tar.gz
 Source4:       %{name}.RunWM
 Source5:       %{name}.wm_style
 Patch0:                %{name}-paths.patch
-Patch1:                %{name}-ac.patch
 URL:           http://www.fvwm.org/
-BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-Requires:      fvwm2-icons
-Requires:      wmconfig >= 0.9.10-6
-Requires:      m4
-Requires:      xinitrc >= 3.0
+%{!?_without_xft:BuildRequires:        Xft-devel}
 BuildRequires: autoconf
 BuildRequires: automake
+%{?_with_fribidi:BuildRequires:        fribidi-devel}
+%{?_with_gnome:BuildRequires:  gnome-libs-devel}
 BuildRequires: gtk+-devel
+BuildRequires: libpng-devel
+%{!?_without_stroke:BuildRequires:     libstroke-devel}
 BuildRequires: readline-devel >= 4.2
+BuildRequires: rpm-perlprov
+Requires:      fvwm2-icons
+Requires:      wmconfig >= 0.9.10-6
+Requires:      m4
+Requires:      xinitrc >= 3.0
 Obsoletes:     fvwm95
+BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _sysconfdir     /etc/X11/fvwm2
-%define                _wmpropsdir     %{_datadir}/wm-properties
+%define                _wmpropsdir     /usr/X11R6/share/wm-properties
 
 %description
 FVWM2 (the F stands for whatever you want, but the VWM stands for
@@ -91,48 +106,61 @@ Ten pakiet zawiera ikony, bitmapy i pixmapy dla fvwm i fvwm2.
 %description icons -l tr
 Fvwm için çeþitli minik görüntü ve simgeler.
 
+%package perl
+Summary:       fvwm-perllib, FvwmPerl and dependent modules
+Summary(pl):   fvwm-perllib, FvwmPerl i zale¿ne modu³y
+Group:         X11/Window Managers/Tools
+Requires:      %{name} = %{version}
+
+%description perl
+fvwm-perllib, FvwmPerl and dependent modules.
+
+%description perl -l pl
+fvwm-perllib, FvwmPerl i zale¿ne modu³y.
+
 %prep
 %setup -n fvwm-%{version} -q -a1 -a3
 %patch0 -p1
-%patch1 -p1
 
 %build
 rm -f missing
 %{__aclocal}
-%{__automake}
 %{__autoconf}
-CXXFLAGS="%{rpmcflags} -fno-rtti -fno-exceptions" \
+%{__automake}
 %configure \
-       --disable-package-subdirs \
        --disable-dmalloc \
        --disable-efence \
        --disable-debug-msgs \
        --disable-command-log \
+       %{!?_with_fribidi:--disable-bidi} \
+       %{?_without_xft:--disable-xft} \
        --enable-multibyte \
        --enable-shape \
-       --disable-gnome \
        --enable-sm \
-       --disable-xinerama \
+       %{?_with_gnome:--with-gnome}%{!?_with_gnome:--without-gnome} \
        --with-xpm-library \
-       --with-rplay-library \
+       --without-rplay-library \
        --with-stroke-library \
        --with-ncurses-library \
        --with-readline-library \
        --with-ncurses-library \
-       --with-gnome
+       --without-termcap-library
+
+# no such library in PLD
+#      --with-rplay-library
 
-touch *
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-#install -d $RPM_BUILD_ROOT{%{_sysconfdir}/{sysconfig/wmstyle,X11/fvwm2},%{_wmpropsdir}}
-install -d $RPM_BUILD_ROOT{%{_sysconfdir},/etc/sysconfig/wmstyle}
+install -d $RPM_BUILD_ROOT{%{_sysconfdir},/etc/sysconfig/wmstyle,%{_wmpropsdir}}
 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-install system.fvwm2rc $RPM_BUILD_ROOT%{_sysconfdir}
+sed -e 's@^ModulePath.*@ModulePath /usr/lib/fvwm:/usr/share/fvwm@;s@^PixmapPath.*@@' \
+       -e 's@^IconPath.*@ImagePath /usr/share/pixmaps:/usr/X11R6/share/pixmaps:/usr/X11R6/include/X11/pixmaps:/usr/X11R6/include/X11/bitmaps:/usr/share/icons:/usr/share/icons/mini@' \
+       system.fvwm2rc > $RPM_BUILD_ROOT%{_sysconfdir}/system.fvwm2rc
 install fvwm2.menu.m4 $RPM_BUILD_ROOT%{_sysconfdir}
 
 rm -rf $RPM_BUILD_ROOT%{_datadir}/icons
@@ -149,27 +177,39 @@ install %{SOURCE5} $RPM_BUILD_ROOT/etc/sysconfig/wmstyle/%{name}.names
 # conflicts with gimp
 rm -f $RPM_BUILD_ROOT%{_datadir}/icons/{folder,question}.xpm
 
-mv -f $RPM_BUILD_ROOT%{_datadir}/wm-properties{,_}
-install -d $RPM_BUILD_ROOT%{_wmpropsdir}
-mv -f $RPM_BUILD_ROOT{%{_datadir}/wm-properties_,%{_wmpropsdir}/fvwm2.desktop}
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc README AUTHORS NEWS
-%doc docs
+%doc README AUTHORS NEWS docs
 %dir /etc/X11/fvwm2
-%config(noreplace) /etc/X11/fvwm2/*
+%config(noreplace) %verify(not size mtime md5) /etc/X11/fvwm2/*
 %attr(755,root,root) /etc/sysconfig/wmstyle/*.sh
 /etc/sysconfig/wmstyle/*.names
-%attr(755,root,root) %{_libdir}/Fvwm*
-%attr(755,root,root) %{_bindir}/*
+%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}/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/*
+%{_datadir}/fvwm/[!p]*
 %{_wmpropsdir}/fvwm2.desktop
-%{_mandir}/man1/*
+%{_mandir}/man1/[!Ff]*.1*
+%{_mandir}/man1/Fvwm[!DGPW]*.1*
+%{_mandir}/man1/FvwmD[!e]*.1*
+%{_mandir}/man1/FvwmGtk.1*
+%{_mandir}/man1/FvwmP[!e]*.1*
+%{_mandir}/man1/FvwmW[!i]*.1*
+%{_mandir}/man1/FvwmWinList.1*
+%{_mandir}/man1/fvwm.1*
+%{_mandir}/man1/fvwm-[!p]*.1*
 
 %files icons
 %defattr(644,root,root,755)
@@ -177,3 +217,17 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_datadir}/icons/mini
 %{_datadir}/icons/*.xpm
 %{_datadir}/icons/mini/*.xpm
+
+%files perl
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/fvwm-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/FvwmWindowLister
+%{_datadir}/fvwm/perllib
+%{_mandir}/man1/fvwm-perllib.1*
+%{_mandir}/man1/FvwmDebug.1*
+%{_mandir}/man1/FvwmGtkDebug.1*
+%{_mandir}/man1/FvwmPerl.1*
+%{_mandir}/man1/FvwmWindowLister.1*