fluxbox 1.3.1-2

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@3390 ec354946-7b23-47d6-9f5a-488ba84defc7

f/fluxbox/fluxbox-vl.spec

@@ -1,46 +1,57 @@
-%define FBversion 1.1.1
+%define FBversion 1.3.1
+%define pversion 1.3.0
 %define patchversion 1.1.0.1
 
-%define fbumenu_version 0.5.2
-%define vinefiles_version 9.8
+%define fbumenu_version 0.5.5
+%define vinefiles_version 11.2
 
 Summary:        Fluxbox is a windowmanager that is based on Blackbox.
 summary(ja):    Fluxbox は Blackbox から派生したウインドウマネージャです。
 Name:           fluxbox
 Version:        %{FBversion}
-Release:        1%{?_dist_release}
+Release:        2%{?_dist_release}
 Group:          User Interface/Desktops
 License:        MIT
 URL:            http://fluxbox.org/
 Vendor:         Project Vine
 Distribution:   Vine Linux
-Source0:        http://downloads.sourceforge.net/fluxbox/%{name}-%{version}.tar.bz2
+Source0:        http://sourceforge.net/projects/fluxbox/files/fluxbox/%{version}/fluxbox-%{version}.tar.bz2
 # styles & scripts 
-Source1:        vinefiles-%{vinefiles_version}.tar.bz2
-Source2:        styles2.tar.bz2
+Source1:        %{name}-vinefiles-%{vinefiles_version}.tar.bz2
+Source2:        styles2-2.tar.bz2
+Source3:        fb_libexec.tar.bz2
+Source4:        fb_extend_menu
 
-Patch0:         fluxbox-%{version}.init-in.patch
+Patch0:         fluxbox-%{pversion}-2.init-in.patch
 ##Patch1:               fluxbox-%{patchversion}.src-clock-tool.patch
 ##Patch2:               fluxbox-%{patchversion}.src-Makefile-in.patch
-Patch3:         fluxbox-%{patchversion}.nls-ja.patch
-Patch4:         fluxbox-%{version}.startfb.patch
-Patch5:         fluxbox-%{patchversion}.menugen-menu-default.patch
-Patch6:         fluxbox-%{patchversion}.menugen-add-app.patch
-Patch8:         fluxbox-%{patchversion}.menugen-utf-8.patch
-Patch9:         fluxbox-%{patchversion}.menugen-vine-ext.patch
+Patch3:         fluxbox-%{pversion}.nls-ja.patch
+Patch4:         fluxbox-%{pversion}-2.startfb.patch
+Patch5:         fluxbox-%{pversion}.menugen-menu-default.patch
+Patch6:         fluxbox-%{pversion}.menugen-add-app.patch
+Patch8:         fluxbox-%{pversion}.menugen-utf-8.patch
+Patch9:         fluxbox-%{pversion}.menugen-vine-ext.patch
+Patch91:        fluxbox-%{pversion}-2.menugen.patch
 
 Patch10:        fbsetbg_setter_priority.patch
-Patch20:        fluxbox-%{patchversion}.Xclients.patch
+##Patch20:        fluxbox-1.1.1.Xclients.patch
+##fluxbox-%{patchversion}.Xclients.patch
 ##Patch30:      fluxbox-%{patchversion}.nls-hh.patch
 Patch40:        fluxbox-%{patchversion}.nls-ja-make.patch
-Patch41:        fluxbox-%{patchversion}.update_cfg.patch
-
-#Patch100:       fluxbox-%{patchversion}.20080913.patch
+Patch41:        fluxbox-%{pversion}.update_cfg.patch
+Patch50:        fluxbox.windowmenu-1.patch
+Patch51:        fluxbox.keys-1.patch
+##Patch100:       fluxbox-%{patchversion}.20080913.patch
 
 BuildRoot:      %{_tmppath}/%{name}-buildroot
 BuildRequires:  libX11-devel libXext-devel 
 BuildRequires:  bzip2 imlib2-devel zlib-devel freetype2-devel
-Requires:       imlib2 imlib2-loader ImageMagick nkf xsri xinitrc
+BuildRequires:  libXpm-devel nkf libXft-devel
+BuildRequires:  libICE-devel libSM-devel libXinerama-devel
+BuildRequires:  libXrandr-devel libXrender-devel
+BuildRequires:  fontconfig-devel libtool
+Requires:       imlib2 imlib2-loader ImageMagick nkf xsri task-xorg-x11
+Requires:       zenity bash
 
 %description
 
@@ -66,51 +77,56 @@ fluxbox に何が出来るか、今後何を計画しているのか？
 
 %prep
 %__rm -rf %{buildroot}
-##%%setup -T -n %{name}-%{version} -c
-%setup -q -a 1
-
-##%__tar jxf  %{SOURCE0}
-##mv -f %{name}-%{FBversion}/* ./
-##rm -rf %{name}-%{FBversion}
+%setup -q -a 1 -a 2 -a 3
 
+## init
 %patch0 -p1
 ##%patch1 -p1
 ##%patch2 -p1
+## nls
 %patch3 -p1
+## startfluxbox
 %patch4 -p1
+## fluxbox-generete_menu
 %patch5 -p1
 %patch6 -p1
 %patch8 -p1
 %patch9 -p1
+%patch91 -p1
+## fbsetbg_setter_priority
 %patch10 -p1
 ##%patch30 -p1
+## nls Makefile.in
 %patch40 -p1
+## fluxbox-update_configs.cc
 %patch41 -p1
-
+## windowmenu
+%patch50 -p1
+## keys
+%patch51 -p1
+## keys
+##%patch50 -p1
 ##%patch100 -p1
 
-%__tar jxf  %{SOURCE1}
-%__tar jxf  %{SOURCE2}
-
 %build
 
 CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ; \
-CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ; \
-FFLAGS="${FFLAGS:-%optflags}" ; export FFLAGS ; \
-./configure --enable-nls \
-        --prefix=%{_prefix} \
-        --exec-prefix=%{_exec_prefix} \
-        --bindir=%{_bindir} \
-        --sbindir=%{_sbindir} \
-        --sysconfdir=%{_sysconfdir} \
-        --datadir=%{_datadir} \
-        --includedir=%{_includedir} \
-        --libdir=%{_libdir} \
-        --libexecdir=%{_libexecdir} \
-        --localstatedir=%{_localstatedir} \
-        --sharedstatedir=%{_sharedstatedir} \
-        --mandir=%{_mandir} \
-        --infodir=%{_infodir}
+    CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ; \
+    FFLAGS="${FFLAGS:-%optflags}" ; export FFLAGS ; \
+    ./configure --enable-nls \
+    --prefix=%{_prefix} \
+    --exec-prefix=%{_exec_prefix} \
+    --bindir=%{_bindir} \
+    --sbindir=%{_sbindir} \
+    --sysconfdir=%{_sysconfdir} \
+    --datadir=%{_datadir} \
+    --includedir=%{_includedir} \
+    --libdir=%{_libdir} \
+    --libexecdir=%{_libexecdir} \
+    --localstatedir=%{_localstatedir} \
+    --sharedstatedir=%{_sharedstatedir} \
+    --mandir=%{_mandir} \
+    --infodir=%{_infodir}
 
 %__make
 
@@ -119,78 +135,56 @@ FFLAGS="${FFLAGS:-%optflags}" ; export FFLAGS ; \
 # fluxbox installation
 make "DESTDIR=%{buildroot}" install
 
+# styles
 %__rm data/styles/Makefile*
 %__cp -a data/styles                %{buildroot}%{_datadir}/%{name}/
 %__cp -a data/styles2               %{buildroot}%{_datadir}/%{name}/
+# wallpapers
 %__cp -a data/backgrounds           %{buildroot}%{_datadir}/%{name}/
+# HTML images
 %__cp -a data/images                %{buildroot}%{_datadir}/%{name}/
+# UserMenu samples
 %__cp -a data/UserMenu              %{buildroot}%{_datadir}/%{name}/
-%__cp data/fb_welcome.sh            %{buildroot}%{_datadir}/%{name}/
+# HTML docs
 %__cp data/*.html                   %{buildroot}%{_datadir}/%{name}/
-%__cp data/fluxbox.desktop.seed     %{buildroot}%{_datadir}/%{name}/fluxbox.desktop
-%__cp data/*.sample                 %{buildroot}%{_datadir}/%{name}/
+# scripts
 %__cp data/fb_welcome               %{buildroot}%{_datadir}/%{name}/
 %__cp data/cng_fbtips               %{buildroot}%{_datadir}/%{name}/
 %__cp data/change-rootcmd           %{buildroot}%{_datadir}/%{name}/
 %__cp data/change-init_rootcmd      %{buildroot}%{_datadir}/%{name}/
-%__cp %{PATCH20}                    %{buildroot}%{_datadir}/%{name}/
+%__cp data/applyoldstyle            %{buildroot}%{_datadir}/%{name}/
 %__cp data/mk-rootcmds              %{buildroot}%{_bindir}/
 %__cp data/fbumenu_gen-%{fbumenu_version} %{buildroot}%{_bindir}/fbumenu_gen
+# changelog
 %__cp ChangeLog                     %{buildroot}%{_datadir}/%{name}/
 
-# gdm session
-%__mkdir_p %{buildroot}%{_sysconfdir}/X11/dm/Sessions/
-%__cp %{buildroot}%{_datadir}/fluxbox/fluxbox.desktop %{buildroot}%{_sysconfdir}/X11/dm/Sessions/
+# xsession desktop entry
+%__mkdir_p %{buildroot}%{_datadir}/xsessions/
+#%__cp data/fluxbox.desktop %{buildroot}%{_datadir}/xsessions/
+%__install -m 644 data/fluxbox.desktop %{buildroot}%{_datadir}/xsessions/
+# logout, reboot, shutdown commands
+%__mkdir_p %{buildroot}%{_libexecdir}/%{name}
+%__install -m 755 fb_libexec/* %{buildroot}%{_libexecdir}/%{name}/
+# extend menu
+%__mkdir_p %{buildroot}%{_datadir}/%{name}/
+%__install -m 755 %{SOURCE4} %{buildroot}%{_datadir}/%{name}/
 
 if [ -z "$DEBUG" ]; then
-        strip   %{buildroot}%{_bindir}/fluxbox \
-                %{buildroot}%{_bindir}/fbsetroot \
-                %{buildroot}%{_bindir}/fbrun
+    strip   %{buildroot}%{_bindir}/fluxbox \
+        %{buildroot}%{_bindir}/fbsetroot \
+        %{buildroot}%{_bindir}/fbrun
 fi
 
 bzip2 %{buildroot}%{_mandir}/man1/*.1
 
 %post
 
-local_lang=`echo $LANG | grep ja_JP`
-if ! [ -z "$local_lang" ]; then
-    l_lang=`echo $LANG | grep ja_JP | cut -d '.' -f 2`
-    case $l_lang in
-        UTF-8)
-            nkfopt="-w"
-            ;;
-        eucJP)
-            nkfopt="-e"
-            ;;
-    esac
-fi
-
-if [ -n "`grep -n "startWM FluxBox fluxbox" /etc/X11/xinit/Xclients | grep "^43:"`" ]; then
-    %__patch -p0 < %{_datadir}/%{name}/fluxbox-%{patchversion}.Xclients.patch
-elif [ -z "`grep "startWM" /etc/X11/xinit/Xclients | grep "startfluxbox$"`" ]; then
-    cat << EOF | nkf $nkfopt
-
-最新でない、改変された /etc/X11/xinit/Xclients が使われているようです。
-起動コマンドを "fluxbox" ではなく "startfluxbox" に設定して下さい。
-
-EOF
-fi
-
 # New menu-system
 %__rm %{_datadir}/fluxbox/menu*
 %{_bindir}/fluxbox-generate_menu \
-        -p %{_prefix} \
-        -o %{_datadir}/fluxbox/menu 2> /dev/null
-
-cat << EOF | nkf $nkfopt
-
-* fluxbox-%{version} : インストール|アップグレードされました。*
-
-※幾つかの更新が有ります。詳細は、
-    file:///usr/share/fluxbox/flux_news.html
-を御覧下さい。
-
-EOF
+    -in -B \
+    -p %{_prefix} \
+    -o %{_datadir}/fluxbox/menu 2> /dev/null
 
 %clean
 
@@ -199,13 +193,45 @@ EOF
 %files
 %defattr(-,root,root,755)
 %doc AUTHORS COPYING ChangeLog INSTALL NEWS README TODO
-%dir %{_datadir}/%{name}
 %{_bindir}/*
-%{_mandir}/*
-%{_datadir}/%{name}/*
-%{_sysconfdir}/X11/dm/Sessions/fluxbox.desktop
+%{_datadir}/*
+%{_libexecdir}/*
+
 
 %changelog
+* Sat Mar 26 2011 KATO Masashi <mkato@par.odn.ne.jp> 1.3.1-2
+- added wide wall paper
+- update documents(flux_news.html)
+
+* Mon Mar  7 2011 KATO Masashi <mkato@par.odn.ne.jp> 1.3.1-1
+- new upstream release.
+
+* Tue Mar  1 2011 KATO Masashi <mkato@par.odn.ne.jp> 1.3.0-1
+- new upstream release.
+- updated patchs.
+- added keys & windowmenu patch.
+- update documents(flux_news.html,styles.html)
+
+* Tue Oct  5 2010 KATO Masashi <mkato@par.odn.ne.jp> 1.1.1-5
+- added BR: libICE-devel libSM-devel libXinerama-devel
+            libXrandr-devel libXrender-devel fontconfig-devel libtool
+- added Requires: task-xorg-x11 bash 
+- dropped Requires: xinitrc libXpm
+
+* Mon Oct  4 2010 MATSUBAYASHI Kohji <shaolin@vinelinux.org> - 1.1.1-4
+- add BR: libXft-devel (1.1.1-3.ppc was built w/o libXft-devel)
+
+* Wed May 26 2010 KATO Masashi <mkato@par.odn.ne.jp> 1.1.1-3
+- update & added Vine documents. (apps.html, config_files.html)
+- Combined some of patches. 
+- update fbumenu_gen script(usermenu generator).
+- added menu commands. (logout, reboot, shutdown)
+- added extend application menu script. (%{SOURCE4})
+
+* Tue Mar 16 2010 KATO Masashi <mkato@par.odn.ne.jp> 1.1.1-2
+- updated wallpapers.
+- moved desktop-entry to %{_datadir}/xsessions/ .
+
 * Fri Sep 19 2008 KATO Masashi <mkato@par.odn.ne.jp> 1.1.1-1
 - new upstream release.
 - removed upstream patchs.
@@ -358,63 +384,63 @@ EOF
     (fix problems of 'can't generates some menus')
     (add some menu items)
     (Japanese help messages)
-- modifying 'init' file(default style, menu-alpha)
-- append sample of 'keys' file
+    - modifying 'init' file(default style, menu-alpha)
+    - append sample of 'keys' file
 
-* Sun May  2 2004 IWAI, Masaharu <iwai@alib.jp> 0.9.9-0vl1
-- new upstream release
+    * Sun May  2 2004 IWAI, Masaharu <iwai@alib.jp> 0.9.9-0vl1
+    - new upstream release
 
-* Sun Mar 14 2004 IWAI, Masaharu <iwai@alib.jp> 0.9.8-0vl2
-- using rpm macros
-- fix nonexistent directory for styles in postscript
-- add BuildRequires: bzip2
-- drop Prefix tag
+    * Sun Mar 14 2004 IWAI, Masaharu <iwai@alib.jp> 0.9.8-0vl2
+    - using rpm macros
+    - fix nonexistent directory for styles in postscript
+    - add BuildRequires: bzip2
+    - drop Prefix tag
 
-* Sat Mar  6 2004 IWAI, Masaharu <iwai@alib.jp> 0.9.8-0vl1
-- new upstream release
-- update vine patch (Patch101)
+    * Sat Mar  6 2004 IWAI, Masaharu <iwai@alib.jp> 0.9.8-0vl1
+    - new upstream release
+    - update vine patch (Patch101)
 
-* Mon Aug 11 2003 IWAI, Masaharu <iwai@alib.jp> 0.1.14-1_0vl2
-- build for VineSeed
-- fix Group tag for VineLinux:
+    * Mon Aug 11 2003 IWAI, Masaharu <iwai@alib.jp> 0.1.14-1_0vl2
+    - build for VineSeed
+    - fix Group tag for VineLinux:
     Graphical desktop/Other -> User Interface/Desktops
-- add /usr/share/%%{name} directory in %%files section
+    - add /usr/share/%%{name} directory in %%files section
 
-* Sat May 31 2003 KATO Masashi <mkato@par.odn.ne.jp> 0.1.14-1_0vl1
-- fluxbox for Vine Linux. Japanese menu enabled at default.
-- modified menu-generator patch (x-terminals)
-- modified init.in patch (date,workspace name,default style)
-- added 2 styles (VineStyle, BlueStar)
+    * Sat May 31 2003 KATO Masashi <mkato@par.odn.ne.jp> 0.1.14-1_0vl1
+    - fluxbox for Vine Linux. Japanese menu enabled at default.
+    - modified menu-generator patch (x-terminals)
+    - modified init.in patch (date,workspace name,default style)
+    - added 2 styles (VineStyle, BlueStar)
 
-* Mon Dec  9 2002 Han Boetes <han@mijncomputer.nl> 0.1.14-1
-- And we have a new release
+    * Mon Dec  9 2002 Han Boetes <han@mijncomputer.nl> 0.1.14-1
+    - And we have a new release
 
-* Sun Dec  1 2002 Han Boetes <han@linux-mandrake.com> 0.1.13-4
-- added only missing patch from bugfixpatch
+    * Sun Dec  1 2002 Han Boetes <han@linux-mandrake.com> 0.1.13-4
+    - added only missing patch from bugfixpatch
 
-* Mon Nov 25 2002 Han Boetes <han@linux-mandrake.com> 0.1.13-3
-- aa-startup- and openoffice-patch from Rathnor
+    * Mon Nov 25 2002 Han Boetes <han@linux-mandrake.com> 0.1.13-3
+    - aa-startup- and openoffice-patch from Rathnor
 
-* Thu Nov 21 2002 Han Boetes <han@linux-mandrake.com> 0.1.13-2
-- Fix locales patch
+    * Thu Nov 21 2002 Han Boetes <han@linux-mandrake.com> 0.1.13-2
+    - Fix locales patch
 
-* Tue Nov 19 2002 Han Boetes <han@linux-mandrake.com> 0.1.13-1
-- Bump
+    * Tue Nov 19 2002 Han Boetes <han@linux-mandrake.com> 0.1.13-1
+    - Bump
 
-* Fri Sep 13 2002 Han Boetes <han@linux-mandrake.com> 0.1.12-1
-- Bump
+    * Fri Sep 13 2002 Han Boetes <han@linux-mandrake.com> 0.1.12-1
+    - Bump
 
-* Tue Sep 10 2002 Han Boetes <han@linux-mandrake.com> 0.1.11-3
-- Applied bugfix2 patch
+    * Tue Sep 10 2002 Han Boetes <han@linux-mandrake.com> 0.1.11-3
+    - Applied bugfix2 patch
 
-* Tue Sep 10 2002 Han Boetes <han@linux-mandrake.com> 0.1.11-2
-- Applied bugfix1 patch
+    * Tue Sep 10 2002 Han Boetes <han@linux-mandrake.com> 0.1.11-2
+    - Applied bugfix1 patch
 
-* Tue Sep  3 2002 Han Boetes <han@mijncomputer.nl> 0.1.11-1
-- Bump
+    * Tue Sep  3 2002 Han Boetes <han@mijncomputer.nl> 0.1.11-1
+    - Bump
 
-* Mon Jul 15 2002 Han Boetes <han@mijncomputer.nl> 0.1.10-1
-- Bump ;kudo's to Kurt Bechstein for recovering the rpm.
+    * Mon Jul 15 2002 Han Boetes <han@mijncomputer.nl> 0.1.10-1
+    - Bump ;kudo's to Kurt Bechstein for recovering the rpm.
 
 * Mon Jun  3 2002 Han Boetes <han@mijncomputer.nl> 0.1.9-2
 - Applied bugfix-patch 2