Przesyłam diffy do speca i patcha kshutdown oraz speca do programu paco. Paco jest to program, który przechwytuje wynik komend takich jak make install czy rpm -i itp. i zapisuje do pliku. Przydatny jest przy instalacji programów ze źródeł (unikamy bajzlu w razie uninstall) oraz przy pisaniu specy (łatwiej jest tworzyć sekcje files). I tu małe wyjaśnienie.
Domyślnie program pisze do /var/log i przez to może być uruchamiany tylko w trybie root. Ale jeżeli chcemy tylko przechwycić wynik make install to po co na root-a wchodzić. Więc można uruchomić go w trybie usera dodając opcję --logdir=$HOME Oczywiście proszę o wrzucenie do cvs -- ___________________________ Linux is like Wigwam. No Gates, No Windows, Apache Inside !!!
--- paco-1.10.2/doc/Makefile.in 2005-11-06 20:26:22.000000000 +0100 +++ paco-1.10.2/doc/Makefile.in 2006-02-06 17:08:11.000000000 +0100 @@ -510,12 +510,7 @@ install-data-local: pacorc - test -d $(sysconfdir) || $(mkinstalldirs) $(sysconfdir) - if test -f $(sysconfdir)/pacorc; then \ - $(INSTALL_DATA) pacorc $(sysconfdir)/pacorc.new; \ - else \ - $(INSTALL_DATA) pacorc $(sysconfdir)/pacorc; \ - fi + $(INSTALL_DATA) pacorc $(DESTDIR)$(sysconfdir)/pacorc; # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT:
Index: kshutdown.spec =================================================================== RCS file: /cvsroot/SPECS/kshutdown.spec,v retrieving revision 1.7 diff -u -r1.7 kshutdown.spec --- kshutdown.spec 4 Aug 2005 09:54:26 -0000 1.7 +++ kshutdown.spec 6 Feb 2006 19:00:00 -0000 @@ -2,17 +2,18 @@ Summary: KDE application for closing Linux Summary(pl): Aplikacja KDE do zamykania Linuksa Name: kshutdown -Version: 0.6.1 +Version: 0.8.2 Release: 1 License: GPL v2 Group: X11/Applications Source0: http://dl.sourceforge.net/kshutdown/%{name}-%{version}.tar.bz2 -# Source0-md5: 9a72132a316e38951bd8d84855ddeefc +# Source0-md5: 6acd45acc5c0669b0973f0246e4bcca7 Patch0: %{name}-desktop.patch URL: http://kshutdown.sourceforge.net/ BuildRequires: automake BuildRequires: kdelibs-devel BuildRequires: rpmbuild(macros) >= 1.129 +Requires: kdelibs >= 3.3.0 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -39,10 +40,6 @@ DESTDIR=$RPM_BUILD_ROOT \ kde_htmldir=%{_kdedocdir} -install -d $RPM_BUILD_ROOT%{_desktopdir} -mv -f $RPM_BUILD_ROOT%{_datadir}/applnk/Utilities/*.desktop \ - $RPM_BUILD_ROOT%{_desktopdir} - %find_lang %{name} --with-kde %clean @@ -53,9 +50,11 @@ %doc AUTHORS ChangeLog README TODO %attr(755,root,root) %{_bindir}/kshutdown %{_datadir}/apps/kconf_update/kshutdown.upd +%{_libdir}/kde3/kshutdown* %{_datadir}/apps/kshutdown %{_iconsdir}/hicolor/*/apps/kshutdown.png %{_desktopdir}/*.desktop +%{_datadir}/apps/kicker/applets/kshutdownlockout.desktop %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog
Index: kshutdown-desktop.patch =================================================================== RCS file: /cvsroot/SOURCES/kshutdown-desktop.patch,v retrieving revision 1.4 diff -u -r1.4 kshutdown-desktop.patch --- kshutdown-desktop.patch 25 May 2005 17:28:57 -0000 1.4 +++ kshutdown-desktop.patch 6 Feb 2006 19:24:10 -0000 @@ -1,18 +1,11 @@ -diff -urN kshutdown-0.6.0.orig/kshutdown/kshutdown.desktop kshutdown-0.6.0/kshutdown/kshutdown.desktop ---- kshutdown-0.6.0.orig/kshutdown/kshutdown.desktop 2005-05-13 16:06:59.000000000 +0200 -+++ kshutdown-0.6.0/kshutdown/kshutdown.desktop 2005-05-13 16:12:05.000000000 +0200 -@@ -20,3 +20,5 @@ - X-DCOP-ServiceType=none - X-KDE-SubstituteUID=false - X-KDE-Username= -+Categories=Qt;KDE;Utility;System; -+# vi: encoding=utf-8 -diff -urN kshutdown-0.6.0.orig/kshutdown/kshutdownwizard.desktop kshutdown-0.6.0/kshutdown/kshutdownwizard.desktop ---- kshutdown-0.6.0.orig/kshutdown/kshutdownwizard.desktop 2005-05-13 16:06:59.000000000 +0200 -+++ kshutdown-0.6.0/kshutdown/kshutdownwizard.desktop 2005-05-13 16:09:54.000000000 +0200 -@@ -23,3 +23,5 @@ - X-DCOP-ServiceType=none - X-KDE-SubstituteUID=false - X-KDE-Username= +--- kshutdown-0.8.2/kshutdown/kshutdown.desktop 2006-01-29 21:27:17.000000000 +0100 ++++ kshutdown-0.8.2/kshutdown/kshutdown.desktop 2006-02-06 20:42:12.000000000 +0100 +@@ -15,4 +15,7 @@ + GenericName[pl]=NarzÄdzie do zamykania systemu + DocPath=kshutdown/index.html + Type=Application +-Categories=KDE;Application;Utility +Categories=Qt;KDE;Utility;System; +# vi: encoding=utf-8 ++ ++
# $Revision: $, $Date: $ Summary: Paco is a source code package organizer for Unix/Linux systems Summary(pl): Paco to manager paczek źródłowych dla systemów Unix/Linux Name: paco Version: 1.10.2 Release: 0.1 License: GPL v2 Group: Applications/System Source0: http://dl.sourceforge.net/paco/%{name}-%{version}.tar.bz2 # Source0-md5: b3cc9a1bd7bf218adf38ee23eecb48dd Patch0: %{name}-Makefile.patch URL: http://paco.sourceforge.net/ #BuildRequires: - #BuildRequires: autoconf #BuildRequires: automake BuildRequires: gtk+2 > 2:2:2.6.0 #BuildRequires: libtool BuildRequires: pkgconfig #Requires(postun): - #Requires(pre,post): - #Requires(preun): - #Requires: - BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description When installing a package from sources, paco wraps the "make install" command (or whatever is needed to install the files into the system), and generates a log containing the list of all installed files. %description -l pl Przy instalacji programów ze źródeł paco przechwytuje "make install" (lub inne komendy które są potrzebne do zainstalowania danego programu) i tworzy log zawierający listę wszystkich instalowanych plików, umożliwiając w przyszłości łatwe i skuteczne odinstalowanie pakietu. %package gui Summary: Gtk+2 frontend to paco Summary(pl): Nakładka na paco w Gtk+2 Group: Applications/System Requires: %{name} = %{version}-%{release} Requires: gtk+2 >= 2:2.6.0 %description gui Gtk+2 gui for paco. %description gui -l pl Graficzny interfejs dla paco w Gtk+2 %package scripts Summary: Addtional scripts for paco Summary: Skrypty dodatkowe dla paco Group: Applications/System Requires: %{name} = %{version}-%{release} %description scripts Some scripts for paco. %description scripts -l pl Jakieś tam skrypciki dla paco. %prep %setup -q %patch0 -p1 %build ./configure \ --enable-a2paco \ --enable-pacoball \ --enable-superpaco \ --prefix=%{_prefix} \ --sysconfdir=%{_sysconfdir} %{__make} %install rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_mandir}/{man5,man8}} %{__make} install \ DESTDIR=$RPM_BUILD_ROOT mv $RPM_BUILD_ROOT%{_prefix}/man/man5/* $RPM_BUILD_ROOT%{_mandir}/man5 mv $RPM_BUILD_ROOT%{_prefix}/man/man8/* $RPM_BUILD_ROOT%{_mandir}/man8 %clean rm -rf $RPM_BUILD_ROOT %files %defattr(644,root,root,755) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/pacorc %attr(755,root,root) %{_bindir}/paco %doc AUTHORS ChangeLog README %{_libdir}/*.so %{_libdir}/libpaco* %{_mandir}/man5/pacorc* %{_mandir}/man8/paco* %files scripts %defattr(644,root,root,755) %attr(755,root,root) %{_bindir}/a2paco %attr(755,root,root) %{_bindir}/superpaco %attr(755,root,root) %{_bindir}/pacoball %{_mandir}/man8/a2paco* %{_mandir}/man8/superpaco* %files gui %defattr(644,root,root,755) %attr(755,root,root) %{_bindir}/gpaco %{_pixmapsdir}/*.png %{_datadir}/*/*/*/paco.mo %{_desktopdir}/*.desktop %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog * %{date} PLD Team <[EMAIL PROTECTED]> All persons listed below can be reached at <cvs_login>@pld-linux.org $Log: $
_______________________________________________ pld-devel-pl mailing list pld-devel-pl@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-devel-pl
