X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=icewm.spec;h=0f756e0b9da8ce6df849270df7f3cae3ff3e6534;hb=3c3df5cc3a1ca443b8a052c0c32a74fdb256a364;hp=bd739d113c7978ba1b4555d25f88506d5895cfd7;hpb=e62a5168957dfbdd818579f6eb0f88bf251835ec;p=packages%2Ficewm.git

diff --git a/icewm.spec b/icewm.spec
index bd739d1..0f756e0 100644
--- a/icewm.spec
+++ b/icewm.spec
@@ -1,34 +1,46 @@
+#
+# TODO:
+# - make a PLD-theme - default :]
+# - bigger menu-file
+#
 Summary:	IceWM X11 Window Manager
 Summary(pl):	IceWM - Mened¿er okienek X11
 Name:		icewm
-Version:	1.0.8
-Release:	1
+Version:	1.0.9
+Release:	2
 License:	LGPL
 Group:		X11/Window Managers
+Group(de):	X11/Fenstermanager
 Group(es):	X11/Administraadores De Ventanas
 Group(fr):	X11/Gestionnaires De Fenêtres
 Group(pl):	X11/Zarz±dcy Okien
-Source0:	ftp://download.sourceforge.net/pub/sourceforge/icewm/%{name}-%{version}-5.tar.bz2
+Source0:	ftp://download.sourceforge.net/pub/sourceforge/icewm/%{name}-%{version}-2.tar.bz2
 Source1:	IceWM.desktop
 Source2:	%{name}.directory
-Patch0:		icewm-DESTDIR.patch
-Patch1:		%{name}-time.patch
+Source3:	ftp://download.sourceforge.net/pub/sourceforge/icewm/iceicons-0.6.tar.gz
+Source4:	IceWM.RunWM
+Source5:	IceWM.wm_style
+Patch0:		%{name}-DESTDIR.patch
+Patch1:		%{name}-menu.patch
 URL:		http://www.icewm.org/
+BuildRequires:	XFree86-devel
 BuildRequires:	autoconf
+BuildRequires:	libtool
+BuildRequires:	esound-devel
+BuildRequires:	gnome-libs-devel
 BuildRequires:	imlib-devel
 BuildRequires:	libjpeg-devel
 BuildRequires:	libpng >= 1.0.8
+BuildRequires:	libstdc++-devel
 BuildRequires:	libtiff-devel
 BuildRequires:	libungif-devel
-BuildRequires:	XFree86-devel
 BuildRequires:	zlib-devel
-BuildRequires:	gnome-libs-devel
-BuildRequires:	libstdc++-devel
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_prefix		/usr/X11R6
 %define		_sysconfdir	/etc/X11/icewm/
 %define		_wmpropsdir	%{_datadir}/wm-properties
+%define		_wmstyledir	/etc/sysconfig/wmstyle
 
 %description
 Window Manager for X Window System. Can emulate the look of
@@ -43,43 +55,76 @@ powy
 roboczych, paski narzêdziowe, status skrzynki z poczt±, cyfrowy zegar.
 Jest przy tym ma³y i szybki.
 
+%package themes-base
+Summary:	Pack of themes for icewm
+Summary(pl):	Zestaw tematów dla icewm
+Group:		Themes
+Group(de):	Themen
+Group(pl):	Motywy
+Requires:	icewm
+
+%description themes-base
+Standard pack of themes delivered with icewm.
+All of them made by Marko Macek:
+gtk2, metal2, motif, nice, warp3, warp4, win95
+
+%description themes-base -l pl
+Standardowy zestaw tematów dla IceWM'a, dostarczany wraz nim.
+Wszystkie stworzone przez Marko Macek:
+gtk2, metal2, motif, nice, warp3, warp4, win95
+
 %prep -q
 %setup -q
 %patch0 -p1
 %patch1 -p1
 
+cd lib/icons
+tar -xvf %{SOURCE3}
+cd ../../
+
 %build
-autoconf
+export LDFLAGS
 %configure \
-	--with-shape \
-	--with-docdir=/usr/share/doc \
-	--with-sm \
-	--with-imlib \
+	--prefix=%{_prefix} \
+	--with-cfgdir=%{_sysconfdir} \
+	--with-docdir=%{_docdir} \
 	--with-gnome \
 	--with-gnome-menus \
 	--with-i18n \
-	--enable-nls \
+	--with-imlib \
+	--with-shape \
+	--with-sm \
+	--enable-antialiasing \
+	--enable-gradients \
 	--enable-guievents \
-	--with-imlib 
+	--enable-nls \
+	--enable-xfreetype 
 
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%{__install} -d $RPM_BUILD_ROOT{%{_wmpropsdir},%{_applnkdir}/Settings/IceWM}
+install -d $RPM_BUILD_ROOT{%{_wmpropsdir},%{_applnkdir}/Settings/IceWM,%{_wmstyledir}}
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-%{__install} %{SOURCE1} $RPM_BUILD_ROOT%{_wmpropsdir}
-%{__install} %{SOURCE2} $RPM_BUILD_ROOT%{_applnkdir}/Settings/IceWM/.directory
-%{__install} lib/keys $RPM_BUILD_ROOT%{_sysconfdir}/keys
-%{__install} lib/menu $RPM_BUILD_ROOT%{_sysconfdir}/menu
-%{__install} lib/toolbar $RPM_BUILD_ROOT%{_sysconfdir}toolbar
-%{__install} lib/preferences $RPM_BUILD_ROOT%{_sysconfdir}/preferences
-%{__install} lib/winoptions $RPM_BUILD_ROOT%{_sysconfdir}/winoptions
+install %{SOURCE1} $RPM_BUILD_ROOT%{_wmpropsdir}
+install %{SOURCE2} $RPM_BUILD_ROOT%{_applnkdir}/Settings/IceWM/.directory
+install lib/keys $RPM_BUILD_ROOT%{_sysconfdir}/keys
+install lib/menu $RPM_BUILD_ROOT%{_sysconfdir}/menu
+install lib/preferences $RPM_BUILD_ROOT%{_sysconfdir}/preferences
+install lib/toolbar $RPM_BUILD_ROOT%{_sysconfdir}toolbar
+install lib/winoptions $RPM_BUILD_ROOT%{_sysconfdir}/winoptions
+install %{SOURCE4} $RPM_BUILD_ROOT%{_wmstyledir}/IceWM.sh
+install %{SOURCE5} $RPM_BUILD_ROOT%{_wmstyledir}/IceWM.names
+
+
+#mv -f %{_libdir}/X11/icewm/icons/* %{_pixmapsdir}/icewm/
+#rm -rf %{_libdir}/X11/icewm/icons
+#ln -s %{_pixmapsdir}/icewm $RPM_BUILD_ROOT%{_libdir}/X11/icewm/icons
 
-gzip -9nf README CHANGES TODO BUGS FAQ icewm.lsm PLATFORMS
+gzip -9nf BUGS CHANGES FAQ PLATFORMS README TODO icewm.lsm
 
 %find_lang %{name}
 
@@ -88,12 +133,28 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/*
 %doc *.gz doc/*.*ml
 %attr(755,root,root) %{_bindir}/*
-%attr(644,root,root)
+%config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/*
 %dir %{_applnkdir}/Settings/IceWM
 %{_applnkdir}/Settings/IceWM/.directory
 %{_wmpropsdir}/*
 %dir %{_libdir}/X11/icewm
-%{_libdir}/X11/icewm/*
+%{_libdir}/X11/icewm/icons
+%{_libdir}/X11/icewm/ledclock
+%{_libdir}/X11/icewm/mailbox
+%{_libdir}/X11/icewm/taskbar
+%dir %{_libdir}/X11/icewm/themes
+%{_libdir}/X11/icewm/themes/Infadel2
+%attr(755,root,root)/etc/sysconfig/wmstyle/IceWM.sh
+%attr(644,root,root)/etc/sysconfig/wmstyle/IceWM.names
+
+%files themes-base
+%defattr(644,root,root,755)
+%{_libdir}/X11/icewm/themes/gtk2
+%{_libdir}/X11/icewm/themes/metal2
+%{_libdir}/X11/icewm/themes/motif
+%{_libdir}/X11/icewm/themes/nice
+%{_libdir}/X11/icewm/themes/warp3
+%{_libdir}/X11/icewm/themes/warp4
+%{_libdir}/X11/icewm/themes/win95