- kill subpackages

- --disable-static for %configure, rm -rf *.la

Changed files:
    alltray.spec -> 1.7

diff --git a/alltray.spec b/alltray.spec
index 471e68dec4be21c51049d23cbd4a00c28caa7467..f79672a464e535be22f11adc9a2095eb2fdeddd6 100644 (file)
--- a/alltray.spec
+++ b/alltray.spec
@@ -26,30 +26,6 @@ Dzi
 Thunderbird czy terminal) do tacki systemowej. Dzia³a dobrze z GNOME,
 KDE, XFCE 4, Fluxboksem i WindowMakerem.
 
 Thunderbird czy terminal) do tacki systemowej. Dzia³a dobrze z GNOME,
 KDE, XFCE 4, Fluxboksem i WindowMakerem.
 

-%package devel
-Summary:       Libraries and header files for alltray
-Summary(pl):   Biblioteki i pliki nag³ówkowe dla alltray
-Group:         Development/Libraries
-Requires:      %{name} = %{version}-%{release}
-
-%description devel
-Libraries and header files for alltray.
-
-%description devel -l pl
-Biblioteki i pliki nag³ówkowe dla alltray.
-
-%package static
-Summary:       Static libraries for alltray
-Summary(pl):   Statyczne biblioteki dla alltray
-Group:         Development/Libraries
-Requires:      %{name}-devel = %{version}-%{release}
-
-%description static
-alltray static libraries.
-
-%description static -l pl
-Biblioteki statyczne dla alltray.
-

 %prep
 %setup -q
 #%%patch0 -p1
 %prep
 %setup -q
 #%%patch0 -p1


@@ -58,7 +34,8 @@ Biblioteki statyczne dla alltray.
 %{__aclocal}
 %{__automake}
 %{__autoconf}
 %{__aclocal}
 %{__automake}
 %{__autoconf}

-%configure
+%configure \
+       --disable-static

 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 %install
 rm -rf $RPM_BUILD_ROOT


@@ -66,6 +43,8 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 

+rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
+

 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 


@@ -75,11 +54,3 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/*
 %attr(755,root,root) %{_libdir}/liballtray*.so.*.*
 %{_mandir}/man1/alltray.1*
 %attr(755,root,root) %{_bindir}/*
 %attr(755,root,root) %{_libdir}/liballtray*.so.*.*
 %{_mandir}/man1/alltray.1*

-
-%files devel
-%defattr(644,root,root,755)
-%{_libdir}/liballtray*.la
-
-%files static
-%defattr(644,root,root,755)
-%{_libdir}/liballtray*.a