diff --git a/xorg-x11-libs.changes b/xorg-x11-libs.changes index f10c89f..b46f4b8 100644 --- a/xorg-x11-libs.changes +++ b/xorg-x11-libs.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Feb 9 14:28:07 UTC 2012 - sndirsch@suse.com + +- no longer package anything, since libs are now packaged + seperately ==> dummy package + ------------------------------------------------------------------- Tue Feb 7 16:58:55 UTC 2012 - sndirsch@suse.com diff --git a/xorg-x11-libs.spec b/xorg-x11-libs.spec index 26d4cab..cca1f99 100644 --- a/xorg-x11-libs.spec +++ b/xorg-x11-libs.spec @@ -17,9 +17,11 @@ # norootforbuild +%define dummy 1 Name: xorg-x11-libs BuildRequires: fdupes fontconfig-devel freetype2-devel gperf libXi6-devel libexpat-devel libtool libxslt pkgconfig xorg-x11-libICE-devel xorg-x11-libSM-devel xorg-x11-libX11-devel xorg-x11-libXau-devel xorg-x11-libXdmcp-devel xorg-x11-libXext-devel xorg-x11-libXfixes-devel xorg-x11-libXmu-devel xorg-x11-libXp-devel xorg-x11-libXpm-devel xorg-x11-libXprintUtil-devel xorg-x11-libXrender-devel xorg-x11-libXt-devel xorg-x11-libXv-devel xorg-x11-libfontenc-devel xorg-x11-libxkbfile-devel xorg-x11-proto-devel xorg-x11-util-devel xorg-x11-xtrans-devel +%if !%{dummy} %ifarch ppc64 s390x x86_64 Provides: libXaw.so.8()(64bit) libXaw.so.7()(64bit) libXaw.so.6()(64bit) Provides: libXaw8.so.8()(64bit) libXaw7.so.7()(64bit) libXaw6.so.6()(64bit) @@ -27,6 +29,7 @@ Provides: libXaw8.so.8()(64bit) libXaw7.so.7()(64bit) libXaw6.so.6()(64bit Provides: libXaw.so.8 libXaw.so.7 libXaw.so.6 Provides: libXaw8.so.8 libXaw7.so.7 libXaw6.so.6 %endif +%endif # bug437293 %ifarch ppc64 Obsoletes: xorg-x11-libs-64bit @@ -99,6 +102,7 @@ to develop X11 applications that require these. %prep %setup -q -T -c %{name} +%if !%{dummy} for i in $RPM_SOURCE_DIR/*.tar.bz2; do tar xjf $i; done pushd libXft-*/src %patch2 -p1 @@ -112,8 +116,12 @@ popd pushd libXfont-* %patch11 -p1 popd +%else +touch dummy +%endif %build +%if !%{dummy} for dir in $(ls); do pushd $dir case $dir in @@ -129,8 +137,10 @@ for dir in $(ls); do %{__make} %{?_smp_mflags} popd done +%endif %install +%if !%{dummy} for dir in $(ls); do pushd $dir make install DESTDIR=$RPM_BUILD_ROOT @@ -159,6 +169,7 @@ done %{__rm} -f %{buildroot}%{_libdir}/*.la %endif %fdupes -s $RPM_BUILD_ROOT/%_mandir +%endif %clean rm -rf "$RPM_BUILD_ROOT" @@ -169,12 +180,19 @@ rm -rf "$RPM_BUILD_ROOT" %files %defattr(-,root,root) +%if %{dummy} +%doc dummy +%else /usr/include/X11/bitmaps/ /usr/include/X11/pixmaps/ /usr/%{_lib}/*.so.* +%endif %files -n xorg-x11-devel %defattr(-,root,root) +%if %{dummy} +%doc dummy +%else %doc /usr/share/doc/* /usr/include/X11/*.h /usr/include/X11/Xaw/ @@ -194,5 +212,6 @@ rm -rf "$RPM_BUILD_ROOT" %doc %{_datadir}/doc/libXvMC/ %doc %{_datadir}/doc/libXaw/ %doc %{_datadir}/doc/libFS/ +%endif %changelog