rpms/WindowMaker/devel WindowMaker.spec,1.20,1.21

[Andreas Bierfert (awjb)]

Author: awjb

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

Modified Files:
	WindowMaker.spec 
Log Message:
- fix install location of WPrefs (#228346)
- fix menu modification sniplet
- split into sub packages to fix multilib issues (#228346)
- mark sh files executable



Index: WindowMaker.spec
===================================================================
RCS file: /cvs/extras/rpms/WindowMaker/devel/WindowMaker.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- WindowMaker.spec	4 Nov 2006 13:21:16 -0000	1.20
+++ WindowMaker.spec	25 Apr 2007 21:13:49 -0000	1.21
@@ -1,7 +1,7 @@
 Summary:	A fast, feature rich Window Manager
 Name:		WindowMaker
 Version:	0.92.0
-Release:	10%{?dist}
+Release:	11%{?dist}
 
 License:	GPL
 Group:		User Interface/Desktops
@@ -64,8 +64,10 @@
 BuildRequires:  fontconfig-devel
 BuildRequires:  automake14 libtool
 
+Requires:       WINGs-libs = %{version}-%{release}
+
 %package devel
-Summary:	libraries needed for WindowMaker.
+Summary:	development files needed for WindowMaker
 Group:		System Environment/Libraries
 Requires:	%{name} = %{version}-%{release}
 Requires:	xorg-x11-proto-devel
@@ -73,10 +75,8 @@
 Requires:	pkgconfig
 Requires:	libXinerama-devel
 Requires:	fontconfig-devel
-Requires:	freetype-devel
 Requires:	libXft-devel
 Requires:	libXext-devel
-Requires:	libXrender-devel
 Requires:	libtiff-devel
 Requires:	zlib-devel
 Requires:	libXpm-devel
@@ -84,7 +84,6 @@
 Requires:	libpng-devel
 Requires:	libungif-devel
 
-
 %description
 Window Maker is an X11 window manager designed to give additional
 integration support to the GNUstep Desktop Environment. In every way
@@ -99,6 +98,30 @@
 possible, it reproduces the elegant look and feel of the NeXTSTEP[tm]
 GUI. This package contains development files for WindowMaker libraries
 
+%package -n WINGs-libs
+Summary:	Libraries needed for WindowMaker
+Group:		System Environment/Libraries
+
+%description -n WINGs-libs
+Libraries needed for WindowMaker
+
+%package -n WINGs-devel
+Summary:        Development files for the WINGs library
+Group:          System Environment/Libraries
+Requires:	libX11-devel
+Requires:	xorg-x11-proto-devel
+Requires:	libXinerama-devel
+Requires:	libXext-devel
+Requires:	libtiff-devel
+Requires:	zlib-devel
+Requires:	libXpm-devel
+Requires:	libjpeg-devel
+Requires:	libpng-devel
+Requires:	libungif-devel
+Requires:	Xft-devel
+Requires:	fontconfig-devel
+%description -n WINGs-devel
+Development files for the WINGs library
 
 %prep
 %setup -q -a10
@@ -136,13 +159,10 @@
 cp %{SOURCE7} WPrefs.app/xpm/nextstyle.xpm
 cp %{SOURCE8} WPrefs.app/tiff/oldstyle.tiff
 
-###### menu fix from Rudolf Kastel
 for i in WindowMaker/*menu* ; do
 echo $i
-mv $i $i.old
-sed -e 's/\/usr\/local\//\/usr\//g' $i.old >$i
-mv $i $i.old
-sed -e 's/\/home\/mawa/$(HOME)/g' $i.old >$i
+sed -i.old -e 's:/usr/local/:%{_prefix}:g' \
+  -e 's:/home/mawa:$(HOME):g' $i
 done
 
 autoreconf -sif
@@ -151,9 +171,8 @@
 # enable new features
 CFLAGS="$RPM_OPT_FLAGS -DBOUNCE_APP -DNEWAPPICON -DVIRTUAL_DESKTOP"
 LINGUAS=`(cd po ; echo *.po|sed 's/zh_TW.Big5.po//g;s/.po//g')`
-GNUSTEP_LOCAL_ROOT='%{_libdir}/GNUstep'
 NLSDIR="%{_datadir}/locale"
-export CFLAGS LINGUAS NLSDIR GNUSTEP_LOCAL_ROOT
+export CFLAGS LINGUAS NLSDIR
 %configure --enable-gnome --enable-kde --enable-usermenu --enable-xinerama \
 --enable-fast-install --enable-modelock --x-includes=%{_includedir} \
 --x-libraries=%{_libdir} --disable-mmx --disable-static --enable-shared
@@ -176,40 +195,74 @@
 
 find %{buildroot} -type f -name "*.la" -exec rm -f {} ';'
 
+chmod 755 %{buildroot}%{_datadir}/%{name}/{autostart.sh,exitscript.sh}
+
 # now install extras stuff
 make -C WindowMaker-extra-0.1 install DESTDIR=$RPM_BUILD_ROOT
 
+# clean up wmlib.pc
+sed -i -e 's:-lWUtil::' $RPM_BUILD_ROOT%{_libdir}/pkgconfig/wmlib.pc
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
+%post -n WINGs-libs -p /sbin/ldconfig
+
+%postun -n WINGs-libs -p /sbin/ldconfig
 
 %files -f '\(WPrefs\|%{name}\|WINGs\)'.lang
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog NEWS FAQ* README* COPYING*
 %config %{_sysconfdir}/%{name}
-%{_datadir}/xsessions/WindowMaker.desktop
 %{_bindir}/*
-%{_datadir}/%{name}
-%{_datadir}/WINGs
-%{_libdir}/GNUstep
-%{_libdir}/*.so.*
+%{_libdir}/libWMaker.so.*
+%{_datadir}/xsessions/WindowMaker.desktop
+%{_datadir}/%{name}/
+%{_datadir}/WPrefs/
 %{_mandir}/man1/*.1x*
 %{_mandir}/sk/man1/*.1x*
 %exclude %{_bindir}/get-*-flags
 
 %files devel
 %defattr(-,root,root,-)
-%{_bindir}/get-wings-flags
-%{_bindir}/get-wraster-flags
 %{_bindir}/get-wutil-flags
-%{_includedir}/WINGs
+%{_libdir}/libWMaker.so
+%{_libdir}/pkgconfig/wmlib.pc
 %{_includedir}/WMaker.h
-%{_includedir}/wraster.h
-%{_libdir}/*.so
-%{_libdir}/pkgconfig/*.pc
 
+%files -n WINGs-libs
+%defattr(-,root,root,-)
+%{_libdir}/libWINGs.so.*
+%{_libdir}/libwraster.so.*
+%{_libdir}/libExtraWINGs.so.*
+%{_libdir}/libWUtil.so.*
+%{_datadir}/WINGs/
+
+%files -n WINGs-devel
+%defattr(-,root,root,-)
+%{_bindir}/get-wings-flags
+%{_bindir}/get-wraster-flags
+%{_libdir}/libWINGs.so
+%{_libdir}/libWUtil.so
+%{_libdir}/libExtraWINGs.so
+%{_libdir}/libwraster.so
+%{_libdir}/pkgconfig/wrlib.pc
+%{_libdir}/pkgconfig/WINGs.pc
+%{_includedir}/WINGs/
+%{_includedir}/wraster.h
 
 %changelog
+* Sun Mar 04 2007 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.92.0-11
+- fix install location of WPrefs (#228346)
+- fix menu modification sniplet
+- split into sub packages to fix multilib issues (#228346)
+- mark sh files executable
+
 * Sat Nov 04 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.92.0-10
 - fix #185579: bouncing animation will respect animations off setting