SPECS (AC-branch): scrollkeeper.spec - merged from HEAD

baggins baggins at pld-linux.org
Mon May 15 16:46:16 CEST 2006


Author: baggins                      Date: Mon May 15 14:46:16 2006 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- merged from HEAD

---- Files affected:
SPECS:
   scrollkeeper.spec (1.50 -> 1.50.2.1) 

---- Diffs:

================================================================
Index: SPECS/scrollkeeper.spec
diff -u SPECS/scrollkeeper.spec:1.50 SPECS/scrollkeeper.spec:1.50.2.1
--- SPECS/scrollkeeper.spec:1.50	Thu Jul 22 10:34:11 2004
+++ SPECS/scrollkeeper.spec	Mon May 15 16:46:11 2006
@@ -4,7 +4,7 @@
 Summary(pt_BR):	ScrollKeeper é um sistema de catálogos para a documentaçăo
 Name:		scrollkeeper
 Version:	0.3.14
-Release:	3
+Release:	5
 Epoch:		1
 License:	GPL
 Group:		Applications/Text
@@ -24,6 +24,7 @@
 BuildRequires:	libxml2-devel >= 2.4.19
 BuildRequires:	libxslt-devel
 BuildRequires:	glib2-devel
+BuildRequires:	rpmbuild(macros) >= 1.179
 Requires(post):	libxml2
 Requires(post,postun):	libxml2-progs
 Requires(post,postun):	/sbin/ldconfig
@@ -131,21 +132,17 @@
 %{_bindir}/scrollkeeper-rebuilddb
 %{_bindir}/scrollkeeper-update
 if ! grep -q %{xmlcat_file} /etc/xml/catalog ; then
-    %xmlcat_add %{xmlcat_file}
-
+	%xmlcat_add %{xmlcat_file}
 fi
 if ! grep -q /etc/sgml/scrollkeeper.cat /etc/sgml/catalog ; then
-    %sgmlcat_add /etc/sgml/scrollkeeper.cat %{sgmlcat_file}
-
+	%sgmlcat_add /etc/sgml/scrollkeeper.cat %{sgmlcat_file}
 fi
 
 %postun
 /sbin/ldconfig
 if [ "$1" = "0" ] ; then
-    %xmlcat_del %{xmlcat_file}
-
-    %sgmlcat_del /etc/sgml/scrollkeeper.cat %{sgmlcat_file}
-
+	%xmlcat_del %{xmlcat_file}
+	%sgmlcat_del /etc/sgml/scrollkeeper.cat %{sgmlcat_file}
 fi
 
 %files -f %{name}.lang
@@ -166,6 +163,27 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.50.2.1  2006/05/15 14:46:11  baggins
+- merged from HEAD
+
+Revision 1.55  2006/01/22 19:50:55  freetz
+- rel.5 for th
+
+Revision 1.54  2004/12/12 00:55:02  qrczak
+- One semicolon too many.
+
+Revision 1.53  2004/12/11 23:50:56  qrczak
+- Updated XML and SGML macros to include a semicolon at the end,
+  instead of putting empty lines after their invocations.
+
+Revision 1.52  2004/12/11 23:08:39  qrczak
+- Added empty lines required for correct expansion of rpm macros.
+- Release 4.
+
+Revision 1.51  2004/10/31 17:07:43  paladine
+- spaces->tabs
+- formatting
+
 Revision 1.50  2004/07/22 08:34:11  qboosh
 - added locale-names patch, change no->nb
 - remove useless .la, updated BRs, release 3
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/scrollkeeper.spec?r1=1.50&r2=1.50.2.1&f=u



More information about the pld-cvs-commit mailing list