- up to 1.0.0

Changed files:
    fluxbox-dont_generate_menu.patch -> 1.3
    fluxbox.spec -> 1.104

diff --git a/fluxbox-dont_generate_menu.patch b/fluxbox-dont_generate_menu.patch
index c79dab19cb6dcef88c9cf6496dc282c70afe11b9..2d15a9c45f4f58806b43d8c37a718e8d9f4cda64 100644 (file)
--- a/fluxbox-dont_generate_menu.patch
+++ b/fluxbox-dont_generate_menu.patch
@@ -1,12 +1,12 @@
---- fluxbox-0.9.14/data/Makefile.am.orig       2005-05-27 13:03:52.000000000 +0200
-+++ fluxbox-0.9.14/data/Makefile.am    2006-02-08 13:05:13.000000000 +0100
-@@ -8,13 +8,10 @@
+--- fluxbox-1.0.0/data/Makefile.am     2007-10-09 20:07:50.211422282 +0200
++++ fluxbox-1.0.0/data/Makefile.am-new 2007-10-09 20:10:10.427236759 +0200
+@@ -11,13 +11,10 @@
  SUBDIRS=              styles
  CLEANFILES=           menu menu.in menu.pre menu.bak init
  MAINTAINERCLEANFILES=         Makefile.in
 -pkgdata_DATA=                 keys menu init
 +pkgdata_DATA=                 keys init
- EXTRA_DIST=           keys init.in README.style README.menu README
+ EXTRA_DIST=           keys init.in
  all-local:            menu init
  install-pkgdataDATA:
 -      @echo "Installing menu file in $(DESTDIR)$(DEFAULT_MENU)"
@@ -14,8 +14,8 @@
 -      $(INSTALL_DATA) menu $(DESTDIR)$(DEFAULT_MENU)
        @echo "Installing keys file in $(DESTDIR)$(DEFAULT_KEYS)"
        $(mkinstalldirs) $(DESTDIR)$(dir $(DEFAULT_KEYS))
-       $(INSTALL_DATA) keys $(DESTDIR)$(DEFAULT_KEYS)
-@@ -29,11 +26,6 @@
+       $(INSTALL_DATA) $(srcdir)/keys $(DESTDIR)$(DEFAULT_KEYS)
+@@ -34,12 +31,6 @@
                        -e "s,@default_style@,$(DEFAULT_STYLE),g" $(srcdir)/init.in > init
  
  menu:                         ../util/fluxbox-generate_menu
@@ -23,6 +23,7 @@
 -              PREFIX="${prefix}" \
 -              MENUTITLE="Fluxbox-${VERSION}" \
 -              INSTALL=Yes \
+-              PATH="${PATH}:../util:../util/fbrun" \
 -              ../util/fluxbox-generate_menu
  
  ../util/fluxbox-generate_menu:

diff --git a/fluxbox.spec b/fluxbox.spec
index b7ad0ad331fa1b366177fb07274262c94eb3069c..951acd789b2db752a318132769c0e012da5fdcfc 100644 (file)
--- a/fluxbox.spec
+++ b/fluxbox.spec
@@ -1,27 +1,25 @@
 #
 # Conditional build:
 %bcond_without imlib2          # disable imlib2 (pixmap themes) support
-%bcond_with    old_wheel       # build with right wheel direction
 #
 Summary:       Fluxbox is a windowmanager that is based on Blackbox
 Summary(pl.UTF-8):     Mały i szybki zarządca okien dla X Window oparty o Blackbox
 Summary(pt_BR.UTF-8):  Fluxbox é um gerenciador de janelas baseado no Blackbox
 Summary(de.UTF-8):     Fluxbox ist ein weiterer Window Manager für X
 Name:          fluxbox
-Version:       0.9.15.1
+Version:       1.0.0
 Release:       1
 Epoch:         1
 License:       MIT-like
 Group:         X11/Window Managers
 Source0:       http://dl.sourceforge.net/fluxbox/%{name}-%{version}.tar.bz2
-# Source0-md5: 098eb36a09338aabb63b938a5eab9ef6
+# Source0-md5: 990e276ead0d04421dce4080f485caca
 Source1:       %{name}.desktop
 Source2:       %{name}-xsession.desktop
 Source3:       %{name}-pld.style
 Source4:       %{name}-pld.jpg
 Source5:       %{name}.menu
 Patch0:                %{name}-dont_generate_menu.patch
-Patch1:                %{name}-wheel_direction.patch
 URL:           http://fluxbox.org/
 BuildRequires: autoconf >= 2.52
 BuildRequires: automake
@@ -72,7 +70,6 @@ Styles.
 %prep
 %setup -q
 %patch0 -p1
-%{!?with_old_wheel:%patch1 -p1}
 
 echo "session.screen0.antialias: true" >> data/init.in
 
@@ -136,8 +133,10 @@ rm -rf $RPM_BUILD_ROOT
 %lang(da) %{_datadir}/fluxbox/nls/da*
 %lang(de) %{_datadir}/fluxbox/nls/de*
 %lang(el) %{_datadir}/fluxbox/nls/el*
+%lang(en) %{_datadir}/fluxbox/nls/en*
 %lang(es) %{_datadir}/fluxbox/nls/es*
 %lang(et) %{_datadir}/fluxbox/nls/et*
+%lang(fi) %{_datadir}/fluxbox/nls/fi*
 %lang(fr) %{_datadir}/fluxbox/nls/fr*
 %lang(it) %{_datadir}/fluxbox/nls/it*
 %lang(ja) %{_datadir}/fluxbox/nls/ja*
@@ -146,14 +145,15 @@ rm -rf $RPM_BUILD_ROOT
 %lang(nb) %{_datadir}/fluxbox/nls/nb*
 %lang(nl) %{_datadir}/fluxbox/nls/nl*
 %lang(pl) %{_datadir}/fluxbox/nls/pl*
-%lang(pt) %{_datadir}/fluxbox/nls/pt_PT
-%lang(pt_BR) %{_datadir}/fluxbox/nls/pt_BR
 %lang(ru) %{_datadir}/fluxbox/nls/ru*
 %lang(sl) %{_datadir}/fluxbox/nls/sl*
 %lang(sv) %{_datadir}/fluxbox/nls/sv*
 %lang(tr) %{_datadir}/fluxbox/nls/tr*
 %lang(uk) %{_datadir}/fluxbox/nls/uk*
 %lang(vi) %{_datadir}/fluxbox/nls/vi*
+%lang(pt_BR) %{_datadir}/fluxbox/nls/pt_BR*
+%lang(pt_PT) %{_datadir}/fluxbox/nls/pt_PT*
+%lang(sk_SK) %{_datadir}/fluxbox/nls/sk_SK*
 %lang(zh_CN) %{_datadir}/fluxbox/nls/zh*
 %{_datadir}/xsessions/%{name}.desktop
 %{_wmpropsdir}/fluxbox.desktop