SPECS: libgda.spec - Require also scrollkeeper as the R(postun) is...

Tue Sep 6 17:42:52 CEST 2005

Author: glen                         Date: Tue Sep  6 15:42:52 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- Require also scrollkeeper as the R(postun) isn't sufficent
- fails parallel make, force 1 job

---- Files affected:
SPECS:
   libgda.spec (1.91 -> 1.92) 

---- Diffs:

================================================================
Index: SPECS/libgda.spec
diff -u SPECS/libgda.spec:1.91 SPECS/libgda.spec:1.92

--- SPECS/libgda.spec:1.91	Tue Jun 14 22:01:33 2005
+++ SPECS/libgda.spec	Tue Sep  6 17:42:47 2005
@@ -56,6 +56,7 @@
 %{?with_xbase:BuildRequires:	xbase-devel >= 2.0.0}
 Requires(post,postun):	/sbin/ldconfig
 Requires(post,postun):	scrollkeeper
+Requires:	scrollkeeper
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -262,7 +263,7 @@
 	--with%{!?with_freetds:out}-tds \
 	--with%{!?with_xbase:out}-xbase \
 	--without-oracle
-%{__make}
+%{__make} -j1
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -283,11 +284,11 @@
 
 %post
 /sbin/ldconfig
-/usr/bin/scrollkeeper-update
+%scrollkeeper_update_post
 
 %postun
 /sbin/ldconfig
-/usr/bin/scrollkeeper-update
+%scrollkeeper_update_postun
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
@@ -389,6 +390,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.92  2005/09/06 15:42:47  glen
+- Require also scrollkeeper as the R(postun) isn't sufficent
+- fails parallel make, force 1 job
+
 Revision 1.91  2005/06/14 20:01:33  freetz
 - 1.2.2
 
@@ -417,7 +422,7 @@
 
 Revision 1.83  2005/04/25 20:54:30  freetz
 - added db4.3 compile fix, removed redundand BR: gettext-devel,
-  run %%inltoolize, rel.2
+  run %inltoolize, rel.2
 
 Revision 1.82  2005/03/15 18:52:51  paladine
 - proper license
@@ -436,7 +441,7 @@
 - merged from DEVEL and updated to 1.2.1
 
 Revision 1.77  2005/02/12 22:46:25  arekm
-rel ++
+- rel ++
 
 Revision 1.76  2005/01/04 21:58:58  adgor
 - Removed a deprecated macro
@@ -446,9 +451,9 @@
 - there is Firebird-devel on alpha now
 
 Revision 1.74  2004/09/15 18:28:34  grzegol
-- in gnome-common-2.8.0 all macros are in %%{_aclocaldir}, not in
-  %%{_aclocaldir}/gnome2-macros, so remove -I %%{_aclocaldir}/gnome2-macros
-  from %%{__aclocal} args and BR: gnome-common >= 2.8.0
+- in gnome-common-2.8.0 all macros are in %{_aclocaldir}, not in
+  %{_aclocaldir}/gnome2-macros, so remove -I %{_aclocaldir}/gnome2-macros
+  from %{__aclocal} args and BR: gnome-common >= 2.8.0
 
 Revision 1.73  2004/09/11 17:46:08  wolf
 - correct group
@@ -516,9 +521,9 @@
 - up to version 1.1.99
 
 Revision 1.56.2.14  2004/09/15 18:24:38  grzegol
-- in gnome-common-2.8.0 all macros are in %%{_aclocaldir}, not in
-  %%{_aclocaldir}/gnome2-macros, so remove -I %%{_aclocal}/gnome2-macros from
-  %%{__aclocal} args and BR: gnome-common >= 2.8.0
+- in gnome-common-2.8.0 all macros are in %{_aclocaldir}, not in
+  %{_aclocaldir}/gnome2-macros, so remove -I %{_aclocal}/gnome2-macros from
+  %{__aclocal} args and BR: gnome-common >= 2.8.0
 
 Revision 1.56.2.13  2004/09/12 10:45:43  grzegol
 - correct group (merged from HEAD)
@@ -647,7 +652,7 @@
 Revision 1.33  2003/02/04 12:25:59  trojan
 - updated to 0.10.0
 - added gda-ldap package
-- fixed %%files
+- fixed %files
 
 Revision 1.32  2002/12/13 09:44:52  wrobell
 - ver. 0.9.0
@@ -659,22 +664,22 @@
 - use more macros, some cosmetics, added missing "rm -f missing" and use new %doc
 
 Revision 1.29  2002/10/02 12:50:40  krzak
-omf.patch
-release 5
+- omf.patch
+- release 5
 
 Revision 1.28  2002/06/30 14:06:39  kloczek
 - release 4: use new %doc.
 
 Revision 1.27  2002/06/23 20:52:52  kloczek
-perl -pi -e "s/^gettextize --copy --force/\%%\{__gettextize\}/"
+- perl -pi -e "s/^gettextize --copy --force/\%\{__gettextize\}/"
 
 Revision 1.26  2002/06/23 20:32:30  kloczek
 - perl -pi -e "s/^libtoolize --copy --force/\%\{__libtoolize\}/"
 
 Revision 1.25  2002/05/21 23:13:45  kloczek
-perl -pi -e "s/^automake -a -c -f --foreing/\%\{__automake\}/; \
+- perl -pi -e "s/^automake -a -c -f --foreing/\%\{__automake\}/; \
              s/^automake -a -c -f/\%\{__automake\}/; \
-	     s/^autoconf/\%\{__autoconf\}/"
+     s/^autoconf/\%\{__autoconf\}/"
 
 Revision 1.24  2002/05/17 14:26:14  kloczek
 - release 3: fixed omf files install path.
@@ -703,7 +708,7 @@
 - updated to 0.2.95 (bugfix release).
 
 Revision 1.16  2002/01/18 02:13:38  kloczek
-perl -pi -e "s/pld-list\@pld.org.pl/feedback\@pld.org.pl/"
+- perl -pi -e "s/pld-list\@pld.org.pl/feedback\@pld.org.pl/"
 
 Revision 1.15  2002/01/17 23:09:48  kloczek
 - updated to 0.2.94 (bugfix release).
@@ -716,7 +721,7 @@
 - !sort BuildRequires rules and remove duplicates.
 
 Revision 1.12  2002/01/10 11:28:54  misiek
-gtk-doc is so broken (--disable-gtk-doc)
+- gtk-doc is so broken (--disable-gtk-doc)
 
 Revision 1.11  2002/01/10 11:03:01  misiek
 - DESTDIR and openldap fixes
@@ -740,10 +745,10 @@
 - modified source URL as ftp.gnome.org changed path (%#$%*&)
 
 Revision 1.5  2001/05/02 16:29:07  qboosh
-- adapterized and made spec %%debug ready or added using %%rpm*flags macros
+- adapterized and made spec %debug ready or added using %rpm*flags macros
 
 Revision 1.4  2001/01/25 20:03:24  misiek
-Massive attack. We use -O0 instead -O flags while debug enabled.
+- Massive attack. We use -O0 instead -O flags while debug enabled.
 
 Revision 1.3  2000/10/23 01:01:50  kloczek
 - added libstdc++-devel to BuildRequires list.
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/libgda.spec?r1=1.91&r2=1.92&f=u


