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

f/fluxbox/fluxbox-vl.spec

@@ -1,9 +1,9 @@
-%define FBversion 1.3.1
+%define FBversion 1.3.2
 %define pversion 1.3.0
 %define patchversion 1.1.0.1
 
 %define fbumenu_version 0.5.5
-%define vinefiles_version 11.2
+%define vinefiles_version 11.3
 
 Summary:        Fluxbox is a windowmanager that is based on Blackbox.
 summary(ja):    Fluxbox は Blackbox から派生したウインドウマネージャです。
@@ -22,26 +22,24 @@ Source2:        styles2-2.tar.bz2
 Source3:        fb_libexec.tar.bz2
 Source4:        fb_extend_menu
 
-Patch0:         fluxbox-%{pversion}-2.init-in.patch
-##Patch1:               fluxbox-%{patchversion}.src-clock-tool.patch
-##Patch2:               fluxbox-%{patchversion}.src-Makefile-in.patch
+### data/init.in
+Patch0:         fluxbox-init_in.patch
+### nls/Translation.m
 Patch3:         fluxbox-%{pversion}.nls-ja.patch
+### util/startfluxbox.in
 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
-
+### util/sfluxbox-generate_menu
+Patch92:        fluxbox-1.3.2.menugen.patch
+### util/fbsetbg
 Patch10:        fbsetbg_setter_priority.patch
-##Patch20:        fluxbox-1.1.1.Xclients.patch
-##fluxbox-%{patchversion}.Xclients.patch
-##Patch30:      fluxbox-%{patchversion}.nls-hh.patch
+### nls/ja_JP/Makefile.in
 Patch40:        fluxbox-%{patchversion}.nls-ja-make.patch
+### util/fluxbox-update_configs.cc
 Patch41:        fluxbox-%{pversion}.update_cfg.patch
+### data/windowmenu
 Patch50:        fluxbox.windowmenu-1.patch
+### data/keys
 Patch51:        fluxbox.keys-1.patch
-##Patch100:       fluxbox-%{patchversion}.20080913.patch
 
 BuildRoot:      %{_tmppath}/%{name}-buildroot
 BuildRequires:  libX11-devel libXext-devel 
@@ -81,21 +79,14 @@ fluxbox に何が出来るか、今後何を計画しているのか？
 
 ## 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
+%patch92 -p1
 ## fbsetbg_setter_priority
 %patch10 -p1
-##%patch30 -p1
 ## nls Makefile.in
 %patch40 -p1
 ## fluxbox-update_configs.cc
@@ -104,9 +95,6 @@ fluxbox に何が出来るか、今後何を計画しているのか？
 %patch50 -p1
 ## keys
 %patch51 -p1
-## keys
-##%patch50 -p1
-##%patch100 -p1
 
 %build
 
@@ -199,6 +187,13 @@ bzip2 %{buildroot}%{_mandir}/man1/*.1
 
 
 %changelog
+* Mon Nov 14 2011 KATO Masashi <mkato@par.odn.ne.jp> 1.3.2-2
+- rewrited spec file
+  (reformat %changelog)
+
+* Mon Nov 14 2011 KATO Masashi <mkato@par.odn.ne.jp> 1.3.2-1
+- new upstream release.
+
 * Sat Mar 26 2011 KATO Masashi <mkato@par.odn.ne.jp> 1.3.1-2
 - added wide wall paper
 - update documents(flux_news.html)
@@ -292,7 +287,7 @@ bzip2 %{buildroot}%{_mandir}/man1/*.1
 * Sun Dec 24 2006 KATO Masashi <mkato@par.odn.ne.jp> 1.0-0vl0.rc2.3, 4
 - add BuildRequires: zlib-devel freetype2-devel
 - add Requires: xsri
-- Change wpsetter's priority (fbsetbg_setter_priority.patch)
+- Change wpsetter''s priority (fbsetbg_setter_priority.patch)
 
 * Thu Jul 20 2006 KATO Masashi <mkato@par.odn.ne.jp> 1.0-0vl0.rc2.1, 2
 - new upstream release
@@ -329,18 +324,18 @@ bzip2 %{buildroot}%{_mandir}/man1/*.1
 * Tue Oct 25 2005 KATO Masashi <mkato@par.odn.ne.jp> 0.9.14-0vl1, 2
 - new upstream release
 - update vine patch
-        (retouch init file for new spec.)
+  (retouch init file for new spec.)
 - update vinefiles
-    (update fbumenu_gen(usermenu generator))
-        (update 2 style files for new spec.)
-        (update fluxtips.txt)
+  (update fbumenu_gen(usermenu generator))
+    (update 2 style files for new spec.)
+    (update fluxtips.txt)
 - update fluxbox_menu_tips.html
 
 * Sun Jun  5 2005 KATO Masashi <mkato@par.odn.ne.jp> 0.9.13-0vl3, 4
 - update vine patch 
-        (add some menu items to fluxbox-generate_menu)
-            (retouch menu structure)
-                (rewrite 'about menu')
+  (add some menu items to fluxbox-generate_menu)
+    (retouch menu structure)
+      (rewrite 'about menu')
 - update vinefiles
     (add usermenu generator to x-utilus)
 - update fluxbox_menu_tips.html
@@ -357,19 +352,19 @@ bzip2 %{buildroot}%{_mandir}/man1/*.1
 * Sun Feb  6 2005 KATO Masashi <mkato@par.odn.ne.jp> 0.9.12-0vl1
 - new upstream release
 - update vine patch 
-        (add some menu items to fluxbox-generate_menu)
-            (include blackbox styles)
-                (extend 'my_mail')
-                (extend 'about menu')
+  (add some menu items to fluxbox-generate_menu)
+    (include blackbox styles)
+      (extend 'my_mail')
+      (extend 'about menu')
 - add nls-ja patch
 
 * Sun Dec 12 2004 KATO Masashi <mkato@par.odn.ne.jp> 0.9.11-0vl1
 - new upstream release
 - update vine patch 
-    (generate japanese menu)
-        (add some menu items to fluxbox-generate_menu)
-        (retouch menu structure)
-        (fix menu backup problem)
+  (generate japanese menu)
+    (add some menu items to fluxbox-generate_menu)
+    (retouch menu structure)
+    (fix menu backup problem)
 
 * Wed Nov 24 2004 IWAI, Masaharu <iwai@alib.jp> 0.9.10-0vl1
 - new upstream release
@@ -381,107 +376,34 @@ bzip2 %{buildroot}%{_mandir}/man1/*.1
 - rewrite 2 styles (VineStyleII, BlueStarII)
 - rewrite fluxtips.txt(for 0.9.x)
 - modifying menu-generator
-    (fix problems of 'can't generates some menus')
+    (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
-
-    * 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
-
-    * 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:
-    Graphical desktop/Other -> User Interface/Desktops
-    - 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)
-
-    * 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
-
-    * 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
-
-    * 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
+- modifying 'init' file(default style, menu-alpha)
+- append sample of 'keys' file
 
-    * 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  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 Jun  3 2002 Han Boetes <han@mijncomputer.nl> 0.1.9-2
-- Applied bugfix-patch 2
-
-* Sat May 25 2002 Han Boetes <han@mijncomputer.nl> 0.1.9-1
-- Version Bump
-- New menu-system
-
-* Thu May  9 2002 Han Boetes <han@mijncomputer.nl> 0.1.8-4
-- Esthetic and Profilactic cleanups
-
-* Fri May  3 2002 Han Boetes <han@mijncomputer.nl> 0.1.8-3
-- Applied bugfix-patch 1+2+3
-
-* Sat Apr 27 2002 Han Boetes <han@mijncomputer.nl> 0.1.8-2
-- Applied bugfix-patch 1
-
-* Fri Apr 19 2002 Han Boetes <han@mijncomputer.nl> 0.1.8-1
-- Bump to version 0.1.8
-
-* Sat Mar  9 2002 Han Boetes <han@mijncomputer.nl> 0.1.7-3
-- Applied patch 1
-
-* Wed Mar  6 2002 Han Boetes <han@mijncomputer.nl> 0.1.7-2
-- Added DEBUG flavor
-
-* Fri Mar  1 2002 Han Boetes <han@mijncomputer.nl> 0.1.7-1
-- BUMP!
-
-* Thu Feb 07 2002 Christian Pelealu <chris@nerv-9.net> 0.1.6-3RH
-- Changed a lot of the build spec for RedHat 7.2
-
-* Tue Jan 29 2002 Han Boetes <han@mijncomputer.nl> 0.1.6-3
-- Applied patch 2
-
-* Sun Jan 13 2002 Han Boetes <han@mijncomputer.nl> 0.1.6-2
-- Applied patch.
-
-* Fri Jan 11 2002 Han Boetes <han@mijncomputer.nl> 0.1.6-1
-- Bump version.
+* Sun May  2 2004 IWAI, Masaharu <iwai@alib.jp> 0.9.9-0vl1
+- new upstream release
 
-* Fri Dec 28 2001 Han Boetes <han@mijncomputer.nl> 0.1.5-1
-- Initial build
+* 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)
+
+* 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
+
+* 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.
+  (initial package for Vine Linux)
+- modified menu-generator patch (x-terminals)
+- modified init.in patch (date,workspace name,default style)
+- added 2 styles (VineStyle, BlueStar)