]> git.pld-linux.org Git - packages/WindowMaker.git/blobdiff - WindowMaker.spec
- do not require xinitrc-ng (it was required cause of /usr/share/xsesions
[packages/WindowMaker.git] / WindowMaker.spec
index 9e982c221d6be1a590be5c20c361922418fd1112..f31fefa3aafea34a3f3b1cd06f8ce3cc69b590a1 100644 (file)
@@ -8,49 +8,49 @@ Summary(pt_BR):       Gerente de Janelas parecido com o NeXT
 Summary(ru):   WindowMaker - ÏËÏÎÎÙÊ ÍÅÎÅÄÖÅÒ ÄÌÑ X11
 Summary(uk):   WindowMaker - ×¦ËÏÎÎÉÊ ÍÅÎÅÄÖÅÒ ÄÌÑ X11
 Name:          WindowMaker
-Version:       0.80.2
-Release:       4
+Version:       0.92.0
+Release:       1
 License:       GPL
 Group:         X11/Window Managers
-Source0:       ftp://ftp.windowmaker.org/pub/source/release/%{name}-%{version}.tar.bz2
-# Source0-md5: 9f4fabc8831af6c58edf8708ee90126f
-Source1:       ftp://windowmaker.org/pub/%{name}-data.tar.gz
+Source0:       ftp://ftp.windowmaker.org/pub/source/release/%{name}-%{version}.tar.gz
+# Source0-md5: 678cb4a9b22a557cfb524dc3cb457c08
+Source1:       %{name}-data.tar.gz
 # Source1-md5: 6ea0c37314ea9e9ab27e8bdf45a31a82
 Source2:       ftp://ftp.windowmaker.org/pub/source/release/%{name}-extra-%{extraver}.tar.gz
 # Source2-md5: 07c7700daaaf232bc490f5abaabef085
 Source3:       %{name}.desktop
-Source4:       %{name}.RunWM
-Source5:       %{name}.wm_style
-Patch0:                %{name}-CFLAGS.patch
-Patch1:                %{name}-wmconfig.patch
-Patch2:                %{name}-pixmaps.patch
-Patch3:                %{name}-shared.patch
-Patch4:                %{name}-areas.patch
+Source6:       %{name}-xsession.desktop
+Patch0:                %{name}-cvs.patch
+Patch1:                %{name}-pl.po-update.patch
+Patch2:                %{name}-CFLAGS.patch
+Patch3:                %{name}-vfmg.patch
+Patch4:                %{name}-shared.patch
 Patch5:                %{name}-IconPosition.patch
 Patch6:                %{name}-singleclick.patch
 Patch7:                %{name}-plmenu.patch
 Patch8:                %{name}-dockit.patch
-Patch9:                %{name}-po.patch
-Patch10:       %{name}-rxvt.patch
-Patch11:       %{name}-pl.po-update.patch
-Patch12:       %{name}-wmchlocale-fixes.patch
-Patch13:       http://www.heily.com/mark/code_samples/appicon_captions_maxprotect.diff
+Patch9:                http://www.heily.com/mark/code_samples/appicon_captions_maxprotect.diff
+Patch10:       %{name}-localenames.patch
+Patch11:       %{name}-0.91.0-translucency-1.patch
+Patch12:       %{name}-gnustep.patch
 URL:           http://www.windowmaker.org/
-BuildRequires: Hermes-devel
-BuildRequires: XFree86-devel
 BuildRequires: autoconf
 BuildRequires: automake
-BuildRequires: libtool
 BuildRequires: gettext-devel
-BuildRequires: libpng >= 1.0.8
 BuildRequires: libjpeg-devel >= 6b
+BuildRequires: libpng-devel >= 1.0.8
 BuildRequires: libtiff-devel
+BuildRequires: libtool >= 1:1.4.2-9
 BuildRequires: libungif-devel
-Requires:      %{name}-libs = %{version}
+BuildRequires: perl-base
+BuildRequires: xorg-lib-libXext-devel
+BuildRequires: xorg-lib-libXft-devel
+BuildRequires: xorg-lib-libXpm-devel
+Requires:      %{name}-libs = %{version}-%{release}
 Requires:      cpp
+Requires:      gnustep-dirs
 Requires:      tk
-Requires:      wmconfig >= 0.9.9-5
-Requires:      xinitrc >= 3.0
+Requires:      vfmg >= 0.9.95
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _sysconfdir     /etc/X11
@@ -142,14 +142,17 @@ zarz
 
 %package devel
 Summary:       WindowMaker libraries - development part
-Summary(es):   Bibliotecas, archivos de inclusión, e etc. para desarrollar aplicaciones WindowMaker
+Summary(es):   Bibliotecas y archivos de inclusión para WindowMaker
 Summary(fr):   Librairies de WindowMaker
 Summary(pl):   Biblioteki WindowMakera - czê¶æ dla programistów
 Summary(pt_BR):        Arquivos de inclusão e bibliotecas para o WindowMaker
 Summary(ru):   âÉÂÌÉÏÔÅËÉ ÐÏÄÄÅÒÖËÉ É .h ÆÁÊÌÙ ÄÌÑ WindowMaker
 Summary(uk):   â¦Â̦ÏÔÅËɠЦÄÔÒÉÍËÉ ÔÁ .h ÆÁÊÌÉ ÄÌÑ WindowMaker
 Group:         Development/Libraries
-Requires:      %{name}-libs = %{version}
+Requires:      %{name}-libs = %{version}-%{release}
+Requires:      xorg-lib-libXext-devel
+Requires:      xorg-lib-libXft-devel
+Requires:      xorg-lib-libXpm-devel
 Obsoletes:     libwraster2-devel
 
 %description devel
@@ -188,7 +191,7 @@ Summary(ru):        
 Summary(uk):   óÔÁÔÉÞΦ Â¦Â̦ÏÔÅËɠЦÄÔÒÉÍËÉ ÄÌÑ WindowMaker
 Group:         Development/Libraries
 Summary(pt_BR):        Componentes estáticos de desenvolvimento para o WindowMaker
-Requires:      %{name}-devel = %{version}
+Requires:      %{name}-devel = %{version}-%{release}
 
 %description static
 This package contains static libraries for building
@@ -224,50 +227,54 @@ utilizando componentes est
 %patch9 -p1
 %patch10 -p1
 %patch11 -p1
-%patch12 -p1
-%patch13 -p1
+%patch12 -p0
 
 for f in WindowMaker/*menu*; do
-       sed s,/usr/local/GNUstep/,/usr/X11R6/lib/GNUstep/, $f >$f.new
-       mv -f $f.new $f
+       sed -i s,/usr/lib/GNUstep/,%{_libdir}/GNUstep/, $f
+       sed -i s,/usr/local/GNUstep/,%{_libdir}/GNUstep/, $f
 done
 
+mv -f po/{no,nb}.po
+
 %build
-rm -f {,%{name}-extra-%{extraver}/}missing
+#%ifarch %{x8664}
+# hack, should be obsolete - needs check
+#export ac_cv_c_inline_asm=no
+#%endif
 %{__libtoolize}
 %{__aclocal}
-%{__autoconf}
+%{__autoheader}
 %{__automake}
+%{__autoconf}
 cd %{name}-extra-%{extraver}
-       %{__libtoolize}
-       %{__aclocal}
-       %{__autoconf}
-       %{__automake}
+%{__libtoolize}
+%{__aclocal}
+%{__autoconf}
+%{__automake}
 cd ..
 
-perl -pi -e 's/defaultAppIcon.#extension#;SharedAppIcon = Yes;/defaultAppIcon.#extension#;/' \
+%{__perl} -pi -e 's/defaultAppIcon.#extension#;SharedAppIcon = Yes;/defaultAppIcon.#extension#;/' \
        WindowMaker/Defaults/WMWindowAttributes.in
 
-LINGUAS="bg cs da de el es et fi fr gl hr hu it ja ko ms nl no pl pt ro ru \
-        sk sv tr zh_CN zh_TW.Big5" ; export LINGUAS
-CPP_PATH="/lib/cpp" ; export CPP_PATH
 %configure \
+       CPP_PATH="/lib/cpp" \
+       LINGUAS="bg cs da de el es et fi fr gl hr hu it ja ko ms nb nl pl pt ro ru \
+                sk sv tr zh_CN zh_TW" \
+       --disable-debug \
        --disable-rpath \
-       --with-nlsdir=%{_datadir}/locale \
+       --enable-shared \
+       --enable-static \
+       --enable-usermenu \
        --with-appspath=%{_libdir}/GNUstep/Apps \
+       --with-nlsdir=%{_datadir}/locale \
+       --with-gnustepdir=%{_libdir}/GNUstep \
        --enable-sound \
        --enable-gnome \
-       --disable-debug \
-       --enable-kde \
-       --enable-shared \
-       --enable-static \
-       --enable-usermenu
+       --enable-kde
 
 touch WindowMaker/Defaults/W*.in
 
 %{__make} \
-       LINGUAS="bg cs da de el es et fi fr gl hr hu it ja ko ms nl no pl pt ro ru \
-               sk sv tr zh_CN zh_TW.Big5" \
        CFLAGS="%{rpmcflags}" \
        LDFLAGS="%{rpmldflags}"
 
@@ -279,12 +286,11 @@ cd %{name}-extra-%{extraver}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_datadir}/pixmaps,%{_wmpropsdir}} \
-       $RPM_BUILD_ROOT/etc/sysconfig/wmstyle
+install -d $RPM_BUILD_ROOT{%{_datadir}/xsessions,%{_pixmapsdir},%{_wmpropsdir}} \
+       $RPM_BUILD_ROOT/etc/sysconfig/wmstyle \
+       $RPM_BUILD_ROOT%{_datadir}/WindowMaker/{Sounds,SoundSets}
 
 %{__make} install \
-       LINGUAS="cs de el es fi fr gl hr it ja ko nl no pl pt ro ru  \
-               se sk tr zh_CN zh_TW.Big5" \
        DESTDIR=$RPM_BUILD_ROOT
 
 install util/bughint $RPM_BUILD_ROOT%{_bindir}
@@ -292,23 +298,20 @@ install util/bughint $RPM_BUILD_ROOT%{_bindir}
 install contrib/dockit   $RPM_BUILD_ROOT%{_bindir}
 install contrib/dockit.1 $RPM_BUILD_ROOT%{_mandir}/man1
 
-install WindowMaker-data/pixmaps/* $RPM_BUILD_ROOT%{_datadir}/pixmaps
+install WindowMaker-data/pixmaps/* $RPM_BUILD_ROOT%{_pixmapsdir}
 install %{SOURCE3} $RPM_BUILD_ROOT%{_wmpropsdir}
 
-install %{SOURCE4} $RPM_BUILD_ROOT/etc/sysconfig/wmstyle/%{name}.sh
-install %{SOURCE5} $RPM_BUILD_ROOT/etc/sysconfig/wmstyle/%{name}.names
+install %{SOURCE6} $RPM_BUILD_ROOT%{_datadir}/xsessions/WindowMaker.desktop
 
-cd %{name}-extra-%{extraver}
-%{__make} install \
+%{__make} -C %{name}-extra-%{extraver} install \
        DESTDIR=$RPM_BUILD_ROOT
-cd ..
 
 %find_lang %{name} --all-name
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post   libs -p /sbin/ldconfig
+%post  libs -p /sbin/ldconfig
 %postun libs -p /sbin/ldconfig
 
 %files -f %{name}.lang
@@ -316,10 +319,7 @@ rm -rf $RPM_BUILD_ROOT
 %doc AUTHORS BUGFORM BUGS ChangeLog FAQ NEWS README
 
 %dir %{_sysconfdir}/WindowMaker
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/WindowMaker/*
-
-%attr(755,root,root) /etc/sysconfig/wmstyle/*.sh
-/etc/sysconfig/wmstyle/*.names
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/WindowMaker/*
 
 %{_mandir}/man1/*
 %lang(sk) %{_mandir}/sk/man1/*
@@ -327,12 +327,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_pixmapsdir}/*
 %{_wmpropsdir}/WindowMaker.desktop
 
+%attr(755,root,root) %{_bindir}/convertfonts
 %attr(755,root,root) %{_bindir}/bughint
 %attr(755,root,root) %{_bindir}/geticonset
 %attr(755,root,root) %{_bindir}/getstyle
 %attr(755,root,root) %{_bindir}/seticons
 %attr(755,root,root) %{_bindir}/setstyle
-%attr(755,root,root) %{_bindir}/wcopy
 %attr(755,root,root) %{_bindir}/wdwrite
 %attr(755,root,root) %{_bindir}/wdread
 %attr(755,root,root) %{_bindir}/wkdemenu.pl
@@ -342,25 +342,23 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/wmaker.inst
 %attr(755,root,root) %{_bindir}/wmsetbg
 %attr(755,root,root) %{_bindir}/wmsetup
-%attr(755,root,root) %{_bindir}/wmchlocale
-%attr(755,root,root) %{_bindir}/wpaste
-%attr(755,root,root) %{_bindir}/wsetfont
 %attr(755,root,root) %{_bindir}/wxcopy
 %attr(755,root,root) %{_bindir}/wxpaste
 %attr(755,root,root) %{_bindir}/dockit
 
 %{_datadir}/WindowMaker
+%{_datadir}/xsessions/WindowMaker.desktop
 
-%dir %{_libdir}/GNUstep
-%dir %{_libdir}/GNUstep/Apps
-%dir %{_libdir}/GNUstep/Apps/WPrefs.app
+# the first one is shared with gnustep-make...
+%dir %{_libdir}/GNUstep/Applications
+%dir %{_libdir}/GNUstep/Applications/WPrefs.app
 
-%attr(755,root,root) %{_libdir}/GNUstep/Apps/WPrefs.app/WPrefs
+%attr(755,root,root) %{_libdir}/GNUstep/Applications/WPrefs.app/WPrefs
 
-%{_libdir}/GNUstep/Apps/WPrefs.app/tiff
-%{_libdir}/GNUstep/Apps/WPrefs.app/xpm
-%{_libdir}/GNUstep/Apps/WPrefs.app/WPrefs.tiff
-%{_libdir}/GNUstep/Apps/WPrefs.app/WPrefs.xpm
+%{_libdir}/GNUstep/Applications/WPrefs.app/tiff
+%{_libdir}/GNUstep/Applications/WPrefs.app/xpm
+%{_libdir}/GNUstep/Applications/WPrefs.app/WPrefs.tiff
+%{_libdir}/GNUstep/Applications/WPrefs.app/WPrefs.xpm
 
 %files libs
 %defattr(644,root,root,755)
@@ -369,12 +367,13 @@ rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/lib*.so
-%{_libdir}/lib*.la
 %attr(755,root,root) %{_bindir}/get-wings-flags
 %attr(755,root,root) %{_bindir}/get-wraster-flags
 %attr(755,root,root) %{_bindir}/get-wutil-flags
+%attr(755,root,root) %{_libdir}/lib*.so
+%{_libdir}/lib*.la
 %{_includedir}/*
+%{_pkgconfigdir}/*.pc
 
 %files static
 %defattr(644,root,root,755)
This page took 0.044459 seconds and 4 git commands to generate.