- pl, some cleanups

Changed files:
    dbus.spec -> 1.4

diff --git a/dbus.spec b/dbus.spec
index ed0334d83a3e5523a6721c048e3f9124deee5405..e155a04dc2c37a6cfdfed329faf967b9a8124919 100644 (file)
--- a/dbus.spec
+++ b/dbus.spec
@@ -4,54 +4,88 @@
 %define qt_version              3.1.0
 
 Summary:       D-BUS message bus
+Summary(pl):   Magistrala przesy³ania komunikatów D-BUS
 Name:          dbus
 Version:       0.11
 Release:       1
+License:       AFL/GPL
+Group:         Libraries
 Source0:       http://www.freedesktop.org/software/dbus/releases/%{name}-%{version}.tar.gz
 # Source0-md5: 87f8cf7ffd114846d577e454ef3129aa
 Patch0:                %{name}-ac.patch
 URL:           http://www.freedesktop.org/software/dbus/
-License:       AFL/GPL
-Group:         Libraries
-BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-PreReq:                chkconfig
+BuildRequires: autoconf
+BuildRequires: automake
 BuildRequires: expat-devel >= %{expat_version}
 BuildRequires: glib2-devel >= %{glib2_version}
-BuildRequires: qt-devel    >= %{qt_version}
 BuildRequires: kdelibs-devel
+BuildRequires: libtool
+BuildRequires: qt-devel    >= %{qt_version}
+#PreReq:       rc-scripts
+#Requires(post,preun): chkconfig
+BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 D-BUS is a system for sending messages between applications. It is
 used both for the systemwide message bus service, and as a
 per-user-login-session messaging facility.
 
+%description -l pl
+D-BUS to system przesy³ania komunikatów pomiêdzy aplikacjami. Jest
+u¿ywany zarówno jako ogólnosystemowa us³uga magistrali komunikatów jak
+i mo¿liwo¶æ przesy³ania komunikatów w ramach jednej sesji u¿ytkownika.
+
 %package devel
-Summary:       Libraries and headers for D-BUS
+Summary:       Header files for D-BUS
+Summary(pl):   Pliki nag³ówkowe D-BUS
 Group:         Development/Libraries
 Requires:      %{name} = %{version}
 
 %description devel
-Headers and static libraries for D-BUS.
+Header files for D-BUS.
+
+%description devel -l pl
+Pliki nag³ówkowe D-BUS.
+
+%package static
+Summary:       Static D-BUS libraries
+Summary(pl):   Statyczne biblioteki D-BUS
+Group:         Development/Libraries
+
+%description static
+Static D-BUS libraries.
+
+%description static -l pl
+Statyczne biblioteki D-BUS.
 
 %package glib
 Summary:       GLib-based library for using D-BUS
-Group:         Development/Libraries
+Summary(pl):   Biblioteka do u¿ywania D-BUS oparta o GLib
+Group:         Libraries
 Requires:      %{name} = %{version}
 
 %description glib
 D-BUS add-on library to integrate the standard D-BUS library with the
 GLib thread abstraction and main loop.
 
+%description glib -l pl
+Dodatkowa biblioteka D-BUS do integracji standardowej biblioteki D-BUS
+z abstrakcj± w±tków i g³ówn± pêtl± GLib.
 
 %package qt
 Summary:       Qt-based library for using D-BUS
-Group:         Development/Libraries
+Summary(pl):   Biblioteka do u¿ywania D-BUS oparta o Qt
+Group:         Libraries
 Requires:      %{name} = %{version}
 
 %description qt
 D-BUS add-on library to integrate the standard D-BUS library with the
 Qt thread abstraction and main loop.
 
+%description qt -l pl
+Dodatkowa biblioteka D-BUS do integracji standardowej biblioteki D-BUS
+z abstrakcj± w±tków i g³ówn± pêtl± Qt.
+
 %prep
 %setup -q
 %patch0 -p1
@@ -79,28 +113,23 @@ rm -rf $RPM_BUILD_ROOT
 ## %find_lang %{gettext_package}
 
 %clean
-rm -rf %{buildroot}
+rm -rf $RPM_BUILD_ROOT
 
-%pre
+#%pre
 # Add the "messagebus" user
 #/usr/sbin/useradd -c 'System message bus' -u 81 \
 #      -s /sbin/nologin -r -d '/' messagebus 2> /dev/null || :
 
-%post
-/sbin/ldconfig
+%post  -p /sbin/ldconfig
 #/sbin/chkconfig --add messagebus
 
-%preun
+#%preun
 #if [ $1 = 0 ]; then
 #    service messagebus stop > /dev/null 2>&1
 #    /sbin/chkconfig --del messagebus
 #fi
 
-%postun
-/sbin/ldconfig
-#if [ "$1" -ge "1" ]; then
-#  service messagebus condrestart > /dev/null 2>&1
-#fi
+%postun        -p /sbin/ldconfig
 
 %post   glib -p /sbin/ldconfig
 %postun glib -p /sbin/ldconfig
@@ -112,30 +141,33 @@ rm -rf %{buildroot}
 %files
 %defattr(644,root,root,755)
 %doc COPYING ChangeLog NEWS
+%attr(755,root,root) %{_bindir}/*
+%attr(755,root,root) %{_libdir}/*dbus-1*.so.*.*.*
+%dir %{_libdir}/dbus-*
 %dir %{_sysconfdir}/dbus-1
 %config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/dbus-1/*.conf
 #/etc/rc.d/init.d/*
 %dir %{_sysconfdir}/dbus-1/system.d
 %dir %{_localstatedir}/run/dbus
-%dir %{_libdir}/dbus-*
-%attr(755,root,root) %{_bindir}/*
-%{_libdir}/*dbus-1*.so.*
 %{_mandir}/man*/*
 #%{_libdir}/dbus-1.0/services
 
 %files devel
 %defattr(644,root,root,755)
-%{_libdir}/libdbus-1*.so
+%attr(755,root,root) %{_libdir}/libdbus-1*.so
 %{_libdir}/libdbus-1*.la
 %{_libdir}/dbus-*/include
 %{_pkgconfigdir}/*
 %{_includedir}/*
+
+%files static
+%defattr(644,root,root,755)
 %{_libdir}/lib*.a
 
 %files glib
 %defattr(644,root,root,755)
-%{_libdir}/*glib*.so.*.*
+%attr(755,root,root) %{_libdir}/*glib*.so.*.*
 
 %files qt
 %defattr(644,root,root,755)
-%{_libdir}/*qt*.so.*.*
+%attr(755,root,root) %{_libdir}/*qt*.so.*.*