rpms/fluxconf/devel fluxconf-Makefile.patch, NONE, 1.1 fluxconf.spec, 1.7, 1.8

[Andreas Bierfert (awjb)]

Author: awjb

Update of /cvs/extras/rpms/fluxconf/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12245/devel

Modified Files:
	fluxconf.spec 
Added Files:
	fluxconf-Makefile.patch 
Log Message:
- use %lang
- fix #170933
- fix build problem


fluxconf-Makefile.patch:

--- NEW FILE fluxconf-Makefile.patch ---
--- src/Makefile.in.orig	2005-10-16 23:11:50.000000000 +0200
+++ src/Makefile.in	2005-10-16 23:13:37.000000000 +0200
@@ -148,7 +148,7 @@
 bin_PROGRAMS = fluxconf
 fluxconf_SOURCES = fluxconf.c fluxmenu.c fluxkeys.c fluxbare.c actions.c 
 fluxconf_INCLUDES = include/globals.h include/defines.h include/functions.h xpm/dalogo.h xpm/fc_menu.xpm xpm/fc_keys.xpm xpm/fc_conf.xpm
-fluxconf_CFLAGS = -Iinclude/ -Ixpm/ -ggdb -D_GNU_SOURCE -Werror
+fluxconf_CFLAGS = -Iinclude/ -Ixpm/ -ggdb -D_GNU_SOURCE
 subdir = src
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs


Index: fluxconf.spec
===================================================================
RCS file: /cvs/extras/rpms/fluxconf/devel/fluxconf.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- fluxconf.spec	29 Jun 2005 10:57:56 -0000	1.7
+++ fluxconf.spec	16 Oct 2005 21:19:38 -0000	1.8
@@ -1,24 +1,20 @@
 Name:		fluxconf
 Version:	0.9.8
-Release:	1%{?dist}
+Release:	2%{?dist}
 
 Summary:	Configuration utility for fluxbox
 
 Group:		User Interface/Desktops
 License:	GPL
 URL:		http://devaux.fabien.free.fr/flux
-
-Source:		http://devaux.fabien.free.fr/flux/fluxconf-0.9.8.tar.gz
-
+Source0:	http://devaux.fabien.free.fr/flux/fluxconf-0.9.8.tar.gz
+Patch0:         fluxconf-Makefile.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	gtk2-devel
 Requires:	fluxbox
 
-
-
 %description
-
 Fluxbox graphical configuration utilities:
 fluxconf: a general configuration tool
 fluxkeys: keyboard shortcut configuration tool
@@ -26,24 +22,17 @@
 
 %prep
 %setup -q
+%patch0
 
 %build
-
-%configure      --bindir=%{_prefix}/X11R6/bin \
-                --mandir=%{_prefix}/X11R6/man \
-
+%configure
 make %{?_smp_mflags}
 
-
-
 %install
-
 rm -rf $RPM_BUILD_ROOT
+%makeinstall
 
-%makeinstall     bindir=$RPM_BUILD_ROOT/%{_prefix}/X11R6/bin \
-                 mandir=$RPM_BUILD_ROOT/%{_prefix}/X11R6/man
-
-cd $RPM_BUILD_ROOT/%{_prefix}/X11R6/bin
+cd $RPM_BUILD_ROOT/%{_bindir}
 rm -f fluxkeys fluxmenu fluxbare
 ln %{name} fluxkeys
 ln %{name} fluxmenu
@@ -54,14 +43,20 @@
 
 %files
 %defattr(0755,root,root,0755)
-%{_prefix}/X11R6/bin/*
+%{_bindir}/*
 %defattr(0644,root,root,0755)
 %doc ChangeLog README COPYING AUTHORS NEWS docs/*.png docs/*.html
 %defattr(0444,root,root)
-%{_prefix}/share/locale/fi/LC_MESSAGES/%{name}.mo
-%{_prefix}/share/locale/fr/LC_MESSAGES/%{name}.mo
+%lang(fi) %{_prefix}/share/locale/fi/LC_MESSAGES/%{name}.mo
+%lang(fr) %{_prefix}/share/locale/fr/LC_MESSAGES/%{name}.mo
 
 %changelog
+* Sun Oct 16 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.8-2
+- use %lang
+- fix #170933
+- fix build problem
+
 * Wed Jun 01 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 - upgrade to 0.9.8