Jarosław Kamper napisał(a):
Dnia piątek, 14 stycznia 2005 03:14, Radosław Kintzi napisał:$ rpmbuild -bb poedit.spec
[...]
$ rpm -q poedit
poedit-1.3.1-0.2
$ rpm -ql poedit | grep mime-info
/usr/share/mime-info/poedit.keys
/usr/share/mime-info/poedit.mime
Pokaż proszę całe rpm -ql poedit
(...)
Szukanie niespakietowanych plików: /usr/lib/rpm/check-files /home/users/radek/tmp/poedit-1.3.1-root-radek
ostrzeżenie: Znaleziono zainstalowane (ale niespakietowane) pliki:
/usr/share/gnome/apps/Development/poedit.desktop
Zapisano: /home/users/radek/rpm/RPMS/poedit-1.3.1-0.2.athlon.rpm
Wykonywanie(%clean): /bin/sh -e /var/tmp/rpm-tmp.59095
+ umask 022
+ cd /home/users/radek/rpm/BUILD
+ cd poedit-1.3.1
+ rm -rf /home/users/radek/tmp/poedit-1.3.1-root-radek
+ exit 0
$ rpm -qpl ../RPMS/poedit-1.3.1-0.2.athlon.rpm /usr/bin/poedit /usr/share/applications/poedit.desktop /usr/share/locale/af_ZA/LC_MESSAGES/poedit.mo /usr/share/locale/am_ET/LC_MESSAGES/poedit.mo /usr/share/locale/be/LC_MESSAGES/poedit.mo /usr/share/locale/bg/LC_MESSAGES/poedit.mo /usr/share/locale/bn/LC_MESSAGES/poedit.mo /usr/share/locale/br/LC_MESSAGES/poedit.mo /usr/share/locale/ca/LC_MESSAGES/poedit.mo /usr/share/locale/cs/LC_MESSAGES/poedit.mo /usr/share/locale/da/LC_MESSAGES/poedit.mo /usr/share/locale/de/LC_MESSAGES/poedit.mo /usr/share/locale/el/LC_MESSAGES/poedit.mo /usr/share/locale/eo/LC_MESSAGES/poedit.mo /usr/share/locale/es/LC_MESSAGES/poedit.mo /usr/share/locale/et/LC_MESSAGES/poedit.mo /usr/share/locale/eu/LC_MESSAGES/poedit.mo /usr/share/locale/fa_IR/LC_MESSAGES/poedit.mo /usr/share/locale/fr/LC_MESSAGES/poedit.mo /usr/share/locale/hi/LC_MESSAGES/poedit.mo /usr/share/locale/hr/LC_MESSAGES/poedit.mo /usr/share/locale/hu/LC_MESSAGES/poedit.mo /usr/share/locale/is/LC_MESSAGES/poedit.mo /usr/share/locale/it/LC_MESSAGES/poedit.mo /usr/share/locale/ja/LC_MESSAGES/poedit.mo /usr/share/locale/ka/LC_MESSAGES/poedit.mo /usr/share/locale/lt/LC_MESSAGES/poedit.mo /usr/share/locale/lv/LC_MESSAGES/poedit.mo /usr/share/locale/mn/LC_MESSAGES/poedit.mo /usr/share/locale/nb/LC_MESSAGES/poedit.mo /usr/share/locale/nl/LC_MESSAGES/poedit.mo /usr/share/locale/nn/LC_MESSAGES/poedit.mo /usr/share/locale/pa_IN/LC_MESSAGES/poedit.mo /usr/share/locale/pl/LC_MESSAGES/poedit.mo /usr/share/locale/pt_BR/LC_MESSAGES/poedit.mo /usr/share/locale/pt_PT/LC_MESSAGES/poedit.mo /usr/share/locale/ro/LC_MESSAGES/poedit.mo /usr/share/locale/ru/LC_MESSAGES/poedit.mo /usr/share/locale/sk/LC_MESSAGES/poedit.mo /usr/share/locale/sl/LC_MESSAGES/poedit.mo /usr/share/locale/sq_AL/LC_MESSAGES/poedit.mo /usr/share/locale/sr/LC_MESSAGES/poedit.mo /usr/share/locale/sv_SE/LC_MESSAGES/poedit.mo /usr/share/locale/ta/LC_MESSAGES/poedit.mo /usr/share/locale/tr/LC_MESSAGES/poedit.mo /usr/share/locale/wa/LC_MESSAGES/poedit.mo /usr/share/locale/zh_CN/LC_MESSAGES/poedit.mo /usr/share/locale/zh_TW/LC_MESSAGES/poedit.mo /usr/share/man/man1/poedit.1.gz /usr/share/mime-info/poedit.keys /usr/share/mime-info/poedit.mime /usr/share/pixmaps/poedit.png /usr/share/pixmaps/poedit.xpm /usr/share/poedit /usr/share/poedit/help-gettext.zip /usr/share/poedit/help-hr.zip /usr/share/poedit/help.zip /usr/share/poedit/resources.zip $ cvs status poedit.spec =================================================================== File: poedit.spec Status: Needs Merge
Working revision: 1.29 Repository revision: 1.32 /cvsroot/SPECS/poedit.spec,v Sticky Tag: (none) Sticky Date: (none) Sticky Options: (none)
$ cvs diff -Naur 1.32 poedit.spec > ../poedit.diff
poedit.diff masz w załączniku. Zrób mi uprzejmość i nie sugeruj że widzę pliki, których nie ma. Te pliki są instalowane przy make install. Odpowiedni fragment buildloga:
mkdir -p /home/users/radek/tmp/poedit-1.3.1-root-radek/usr/share/mime-info
(...)
if test -w /home/users/radek/tmp/poedit-1.3.1-root-radek/usr/share/mime-info ; then \
install -m 644 ./poedit.mime /home/users/radek/tmp/poedit-1.3.1-root-radek/usr/share/mime-info; \
install -m 644 poedit.keys /home/users/radek/tmp/poedit-1.3.1-root-radek/usr/share/mime-info; \
fi
Dlaczego zmuszasz mnie do wysiłku, kiedy już raz dałem Ci gotowe rozwiązanie?
-- Radosław Kintzi (radek/at/rakin.eu.org)
Index: poedit.spec
===================================================================
RCS file: /cvsroot/SPECS/poedit.spec,v
retrieving revision 1.32
diff -a -u -r1.32 poedit.spec
--- poedit.spec 15 Jan 2005 13:26:46 -0000 1.32
+++ poedit.spec 15 Jan 2005 13:44:17 -0000
@@ -1,4 +1,4 @@
-# $Revision: 1.32 $, $Date: 2005/01/15 13:26:46 $
+# $Revision: 1.29 $, $Date: 2004/11/08 18:24:50 $
# TODO:
# - install GNOME and KDE releated files (MIME files)
Summary: Gettext catalogs editor
@@ -13,11 +13,11 @@
Source1: %{name}.desktop
Source2: %{name}.png
Patch0: %{name}-system_libs.patch
+Patch1: %{name}-DESTDIR.patch
URL: http://poedit.sourceforge.net/
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: gtk+2-devel
-BuildRequires: gtkspell-devel
BuildRequires: wxGTK2-unicode-devel >= 2.4.0-0.8
BuildRequires: zip
Requires: gettext
@@ -44,11 +44,12 @@
%prep
%setup -q
%patch0 -p1
+#%patch1 -p1
%build
-%{__aclocal} -I admin
-%{__autoconf}
-%{__automake}
+#%{__aclocal}
+#%{__autoconf}
+#%{__automake}
%configure \
--disable-transmem \
--with-wx-config=wxgtk2u-2.4-config \
@@ -62,15 +63,13 @@
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_pixmapsdir},%{_desktopdir},%{_datadir}/mime-info/}
+install -d $RPM_BUILD_ROOT{%{_pixmapsdir},%{_desktopdir}}
%{__make} install \
- EXTRADIR="" \
DESTDIR=$RPM_BUILD_ROOT
install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
install %{SOURCE2} $RPM_BUILD_ROOT%{_pixmapsdir}
-install install/poedit.{mime,keys} $RPM_BUILD_ROOT%{_datadir}/mime-info/
%find_lang %{name}
@@ -93,19 +92,6 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log: poedit.spec,v $
-Revision 1.32 2005/01/15 13:26:46 jack
-- added missing poedit.{mime,keys} files from mime-info
-
-Revision 1.31 2005/01/13 20:18:00 wiget
-- BR: gtkspell-devel
-- rebuild AC/AM (added -I admin to aclocal invocation)
-- don't build contrib libs on install
-
-Revision 1.30 2005/01/13 17:34:53 jack
-- updated poedit to 1.3.1
-- dropped Patch1 - it's already in sources
-- still segfaults on startup (like 1.2.4) ;)
-
Revision 1.29 2004/11/08 18:24:50 zergin
- added missing BR: zip (by Zbyniu Krzystolik)
_______________________________________________ pld-devel-pl mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-devel-pl
