SPECS: jabber-mu-conference.spec, jabber-tlen-transport.spec, jaka...

glen glen at pld-linux.org
Tue Dec 13 13:57:00 CET 2005


Author: glen                         Date: Tue Dec 13 12:57:00 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- adapterized (sorted %verify attrs)

---- Files affected:
SPECS:
   jabber-mu-conference.spec (1.20 -> 1.21) , jabber-tlen-transport.spec (1.6 -> 1.7) , jakarta-tomcat.spec (1.35 -> 1.36) , janchor.spec (1.11 -> 1.12) , jboss.spec (1.27 -> 1.28) , jed.spec (1.78 -> 1.79) , jesred.spec (1.12 -> 1.13) , jftpgw.spec (1.16 -> 1.17) , jjigw.spec (1.3 -> 1.4) , kannel.spec (1.23 -> 1.24) , kdegames.spec (1.145 -> 1.146) , kdenetwork.spec (1.200 -> 1.201) , kernel-misc-fuse.spec (1.49 -> 1.50) , kernel-misc-mwavem.spec (1.7 -> 1.8) , kgicon.spec (1.25 -> 1.26) , kismet.spec (1.25 -> 1.26) , knock.spec (1.7 -> 1.8) , koha.spec (1.5 -> 1.6) , krb5.spec (1.55 -> 1.56) , kudzu.spec (1.32 -> 1.33) 

---- Diffs:

================================================================
Index: SPECS/jabber-mu-conference.spec
diff -u SPECS/jabber-mu-conference.spec:1.20 SPECS/jabber-mu-conference.spec:1.21
--- SPECS/jabber-mu-conference.spec:1.20	Tue Jun  1 13:41:16 2004
+++ SPECS/jabber-mu-conference.spec	Tue Dec 13 13:56:54 2005
@@ -19,10 +19,10 @@
 Patch1:		%{name}-config.patch
 Patch2:		%{name}-drop_priv.patch
 URL:		http://mu-conference.jabberstudio.org/
-PreReq:		rc-scripts
-Requires(post,preun):	/sbin/chkconfig
 Requires(post):	perl-base
 Requires(post):	textutils
+Requires(post,preun):	/sbin/chkconfig
+Requires:	rc-scripts
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -92,12 +92,12 @@
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog FAQ README TODO *.xml
 %attr(755,root,root) %{_sbindir}/*
-%attr(640,root,jabber) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/jabber/*
+%attr(640,root,jabber) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/jabber/*
 %attr(754,root,root) /etc/rc.d/init.d/jabber-muc
 %dir %attr(771,root,jabber) /var/lib/jabber-mu-conference/
 %dir %attr(775,root,jabber) /var/log/jabber-mu-conference/
 %dir %attr(775,root,jabber) /var/log/jabber-mu-conference/chats
-%config(noreplace) %verify(not size mtime md5) /etc/sysconfig/jabber-muc
+%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/jabber-muc
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -105,6 +105,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.21  2005/12/13 12:56:54  glen
+- adapterized (sorted %verify attrs)
+
 Revision 1.20  2004/06/01 11:41:16  jajcus
 - Release: 3
 - build with JCR instead of jabberd14-devel - no more jabberd-1.4 dependency

================================================================
Index: SPECS/jabber-tlen-transport.spec
diff -u SPECS/jabber-tlen-transport.spec:1.6 SPECS/jabber-tlen-transport.spec:1.7
--- SPECS/jabber-tlen-transport.spec:1.6	Sun Jan  9 00:42:43 2005
+++ SPECS/jabber-tlen-transport.spec	Tue Dec 13 13:56:54 2005
@@ -15,9 +15,9 @@
 BuildRequires:	libtlen-devel
 BuildRequires:	libxode-devel
 BuildRequires:	openssl-devel
-Requires(pre):	jabber-common
-Requires(post,preun):	/sbin/chkconfig
 Requires(post):	/usr/bin/perl
+Requires(post,preun):	/sbin/chkconfig
+Requires(pre):	jabber-common
 Requires:	jabber-common
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -78,10 +78,10 @@
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog DEBUG DONE README THANKS TODO
 %attr(755,root,root) %{_sbindir}/*
-%attr(640,root,jabber) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/jabber/jabber-tlen-transport.xml
+%attr(640,root,jabber) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/jabber/jabber-tlen-transport.xml
 %attr(754,root,root) /etc/rc.d/init.d/jabber-tlen-transport
 %attr(770,root,jabber) /var/lib/jabber/tlen
-%config(noreplace) %verify(not size mtime md5) /etc/sysconfig/jabber-tlen-transport
+%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/jabber-tlen-transport
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -89,6 +89,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.7  2005/12/13 12:56:54  glen
+- adapterized (sorted %verify attrs)
+
 Revision 1.6  2005/01/08 23:42:43  djrzulf
 - Rel 2,
 - STBR to AC-ready,

================================================================
Index: SPECS/jakarta-tomcat.spec
diff -u SPECS/jakarta-tomcat.spec:1.35 SPECS/jakarta-tomcat.spec:1.36
--- SPECS/jakarta-tomcat.spec:1.35	Sun Nov 20 14:24:08 2005
+++ SPECS/jakarta-tomcat.spec	Tue Dec 13 13:56:54 2005
@@ -7,9 +7,9 @@
 Release:	4
 License:	Apache
 Group:		Development/Languages/Java
-Source0:	http://jakarta.apache.org/builds/%{name}-%{base_version}/release/v%{version}/src/%{name}-%{version}-src.tar.gz
+Source0:	http://jakarta.apache.org/builds/jakarta-tomcat-%{base_version}/release/v%{version}/src/%{name}-%{version}-src.tar.gz
 # Source0-md5:	bdcdf1091ff942f378b1e6f402e44a67
-Source1:	http://jakarta.apache.org/builds/%{name}-%{base_version}/release/v%{version}/src/%{name}-connectors-%{version}-src.tar.gz
+Source1:	http://jakarta.apache.org/builds/jakarta-tomcat-%{base_version}/release/v%{version}/src/%{name}-connectors-%{version}-src.tar.gz
 # Source1-md5:	0daa701e51d04570006abce1ac580aed
 Source2:	%{name}.init
 Patch0:		%{name}-fixes.patch
@@ -19,13 +19,13 @@
 # required:
 BuildRequires:	jaas
 BuildRequires:	jakarta-ant >= 1.5.3
-BuildRequires:	jakarta-servletapi >= 4
-BuildRequires:	jakarta-commons-collections
 BuildRequires:	jakarta-commons-beanutils
+BuildRequires:	jakarta-commons-collections
 BuildRequires:	jakarta-commons-digester
-BuildRequires:	jakarta-commons-logging
 BuildRequires:	jakarta-commons-fileupload
+BuildRequires:	jakarta-commons-logging
 BuildRequires:	jakarta-regexp
+BuildRequires:	jakarta-servletapi >= 4
 BuildRequires:	jakarta-struts >= 1.0.2
 BuildRequires:	jaxp_parser_impl
 BuildRequires:	jdk >= 1.2
@@ -46,33 +46,33 @@
 BuildRequires:	junit >= 3.7
 BuildRequires:	tyrex >= 1.0
 BuildRequires:	xml-commons
-Requires:	jre >= 1.2
-Requires:	jakarta-servletapi >= 4
-Requires:	jakarta-commons-collections
+Requires(post,postun):	/sbin/ldconfig
+Requires(post,preun):	/sbin/chkconfig
+Requires(postun):	/usr/sbin/groupdel
+Requires(postun):	/usr/sbin/userdel
+Requires(pre):	/bin/id
+Requires(pre):	/usr/bin/getgid
+Requires(pre):	/usr/sbin/groupadd
+Requires(pre):	/usr/sbin/useradd
+Requires:	jaas
+Requires:	jaf >= 1.0.1
 Requires:	jakarta-commons-beanutils
+Requires:	jakarta-commons-collections
 Requires:	jakarta-commons-digester
-Requires:	jakarta-commons-logging
 Requires:	jakarta-commons-fileupload
+Requires:	jakarta-commons-logging
 Requires:	jakarta-regexp
+Requires:	jakarta-servletapi >= 4
+Requires:	javamail >= 1.2
+Requires:	jaxp_parser_impl
 Requires:	jdbc-stdext >= 2.0
 Requires:	jndi >= 1.2.1
-Requires:	jaf >= 1.0.1
-Requires:	javamail >= 1.2
+Requires:	jre >= 1.2
 Requires:	jsse >= 1.0.2
 Requires:	jta >= 1.0.1
+Requires:	mx4j >= 1.1.1
 Requires:	tyrex >= 1.0
-Requires:	jaxp_parser_impl
 Requires:	xml-commons
-Requires:	jaas
-Requires:	mx4j >= 1.1.1
-Requires(pre):	/usr/bin/getgid
-Requires(pre):	/bin/id
-Requires(pre):	/usr/sbin/groupadd
-Requires(pre):	/usr/sbin/useradd
-Requires(postun):	/usr/sbin/groupdel
-Requires(postun):	/usr/sbin/userdel
-Requires(post,preun):	/sbin/chkconfig
-Requires(post,postun):	/sbin/ldconfig
 Provides:	group(http)
 Provides:	user(http)
 BuildArch:	noarch
@@ -290,7 +290,7 @@
 %{_tomcatdir}/temp
 # tomcat wants to regenerate tomcat-users.xml
 %attr(775,root,http) %dir %{_sysconfdir}/tomcat
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/tomcat/*
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/tomcat/*
 %attr(754,root,root) /etc/rc.d/init.d/tomcat
 %dir %{_vardir}
 %attr(1730,root,http) %dir %{_vardir}/work
@@ -306,6 +306,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.36  2005/12/13 12:56:54  glen
+- adapterized (sorted %verify attrs)
+
 Revision 1.35  2005/11/20 13:24:08  saq
 - reverted faulty commit (1.34)
 

================================================================
Index: SPECS/janchor.spec
diff -u SPECS/janchor.spec:1.11 SPECS/janchor.spec:1.12
--- SPECS/janchor.spec:1.11	Sun Jun  5 02:55:45 2005
+++ SPECS/janchor.spec	Tue Dec 13 13:56:54 2005
@@ -7,7 +7,7 @@
 Release:	1
 License:	GPL
 Group:		Applications/Communications
-Source0:	http://janchor.jabberstudio.org/all_versions/janchor-%{version}.tar.gz
+Source0:	http://janchor.jabberstudio.org/all_versions/%{name}-%{version}.tar.gz
 # Source0-md5:	3facec92cb34c0e4609c345990a411bd
 Source1:	%{name}.init
 Source2:	%{name}.sysconfig
@@ -18,10 +18,10 @@
 Patch4:		%{name}-presence_type_available.patch
 URL:		http://janchor.jabberstudio.org/
 BuildRequires:	rpm-perlprov
-PreReq:		rc-scripts
 Requires(post,preun):	/sbin/chkconfig
 Requires:	daemon
 Requires:	jabber-common
+Requires:	rc-scripts
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -94,9 +94,9 @@
 %defattr(644,root,root,755)
 %doc README.html VISION.html
 %attr(755,root,root) %{_sbindir}/*
-%attr(640,root,jabber) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/jabber/janchor.rc
+%attr(640,root,jabber) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/jabber/janchor.rc
 %attr(754,root,root) /etc/rc.d/init.d/janchor
-%config(noreplace) %verify(not size mtime md5) /etc/sysconfig/janchor
+%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/janchor
 %attr(664,root,jabber) /var/log/janchor.log
 %dir %attr(775,root,jabber) /var/lib/janchor
 
@@ -106,6 +106,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.12  2005/12/13 12:56:54  glen
+- adapterized (sorted %verify attrs)
+
 Revision 1.11  2005/06/05 00:55:45  zbyniu
 - BR: rpm-perlprov
 

================================================================
Index: SPECS/jboss.spec
diff -u SPECS/jboss.spec:1.27 SPECS/jboss.spec:1.28
--- SPECS/jboss.spec:1.27	Thu Nov  3 18:13:51 2005
+++ SPECS/jboss.spec	Tue Dec 13 13:56:54 2005
@@ -17,14 +17,14 @@
 URL:		http://www.jboss.org/
 BuildRequires:	jdk
 BuildRequires:	rpmbuild(macros) >= 1.202
-Requires:	jdk
+Requires(post,preun):	/sbin/chkconfig
+Requires(postun):	/usr/sbin/groupdel
+Requires(postun):	/usr/sbin/userdel
 Requires(pre):	/bin/id
 Requires(pre):	/usr/bin/getgid
 Requires(pre):	/usr/sbin/groupadd
 Requires(pre):	/usr/sbin/useradd
-Requires(postun):	/usr/sbin/groupdel
-Requires(postun):	/usr/sbin/userdel
-Requires(post,preun):	/sbin/chkconfig
+Requires:	jdk
 Provides:	group(jboss)
 Provides:	user(jboss)
 BuildArch:	noarch
@@ -138,7 +138,7 @@
 /var/lib/%{name}/minimal/deploy
 /var/lib/%{name}/minimal/lib
 
-%attr(644,root,root) %config(noreplace) %verify(not size mtime md5) /etc/sysconfig/%{name}
+%attr(644,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/%{name}
 
 # ghost files and directories
 %ghost %{_libdir}/%{name}/tmp
@@ -158,6 +158,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.28  2005/12/13 12:56:54  glen
+- adapterized (sorted %verify attrs)
+
 Revision 1.27  2005/11/03 17:13:51  qboosh
 - mesh.dl is not browsable
 

================================================================
Index: SPECS/jed.spec
diff -u SPECS/jed.spec:1.78 SPECS/jed.spec:1.79
--- SPECS/jed.spec:1.78	Fri Sep 16 10:42:32 2005
+++ SPECS/jed.spec	Tue Dec 13 13:56:54 2005
@@ -1,3 +1,4 @@
+# $Revision$, $Date$
 %define		tar_ver	B0.99-17.111
 Summary:	A small fast editor
 Summary(de):	Ein kleiner, schneller Editor
@@ -257,6 +258,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.79  2005/12/13 12:56:54  glen
+- adapterized (sorted %verify attrs)
+
 Revision 1.78  2005/09/16 08:42:32  arekm
 - rel .2 (amd64 fixed)
 

================================================================
Index: SPECS/jesred.spec
diff -u SPECS/jesred.spec:1.12 SPECS/jesred.spec:1.13
--- SPECS/jesred.spec:1.12	Wed Jun 11 18:09:51 2003
+++ SPECS/jesred.spec	Tue Dec 13 13:56:54 2005
@@ -50,7 +50,7 @@
 %doc README
 %attr(755,root,root) %{_bindir}/*
 %attr(750,root,squid) %dir %{_sysconfdir}
-%attr(640,root,squid) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/*
+%attr(640,root,squid) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/*
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -58,6 +58,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.13  2005/12/13 12:56:54  glen
+- adapterized (sorted %verify attrs)
+
 Revision 1.12  2003/06/11 16:09:51  ankry
 - rel 0.1: missing source file
 

================================================================
Index: SPECS/jftpgw.spec
diff -u SPECS/jftpgw.spec:1.16 SPECS/jftpgw.spec:1.17
--- SPECS/jftpgw.spec:1.16	Sun Jul 10 21:36:03 2005
+++ SPECS/jftpgw.spec	Tue Dec 13 13:56:54 2005
@@ -12,10 +12,10 @@
 Source2:	%{name}.init
 URL:		http://www.mcknight.de/jftpgw/
 BuildRequires:	rpmbuild(macros) >= 1.202
+Requires(post,preun):	/sbin/chkconfig
+Requires(postun):	/usr/sbin/userdel
 Requires(pre):	/bin/id
 Requires(pre):	/usr/sbin/useradd
-Requires(postun):	/usr/sbin/userdel
-Requires(post,preun):	/sbin/chkconfig
 Provides:	user(jftpgw)
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -85,7 +85,7 @@
 %attr(755,root,root) %{_sbindir}/*
 %attr(754,root,root) /etc/rc.d/init.d/jftpgw
 %dir %{_sysconfdir}
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/*
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/*
 %{_mandir}/man1/*
 %dir /var/log/jftpgw
 %attr(644,jftpgw,root) /var/log/jftpgw/jftpgw.log
@@ -97,6 +97,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.17  2005/12/13 12:56:54  glen
+- adapterized (sorted %verify attrs)
+
 Revision 1.16  2005/07/10 19:36:03  darekr
 - cosmetics
 

================================================================
Index: SPECS/jjigw.spec
diff -u SPECS/jjigw.spec:1.3 SPECS/jjigw.spec:1.4
--- SPECS/jjigw.spec:1.3	Sat Jul 31 02:01:59 2004
+++ SPECS/jjigw.spec	Tue Dec 13 13:56:54 2005
@@ -6,18 +6,18 @@
 Release:	0.2
 License:	GPL
 Group:		Applications/Communications
-Source0:	http://www.jabberstudio.org/files/%{name}/%{name}-%{version}.tar.gz
+Source0:	http://www.jabberstudio.org/files/jjigw/%{name}-%{version}.tar.gz
 # Source0-md5:	b8b25ebed5aedb28365a528211bdd75e
 Source1:	%{name}.xml
 Source2:	%{name}.init
 Source3:	%{name}.sysconfig
 URL:		http://www.jabberstudio.org/projects/jjigw/
-PreReq:		rc-scripts
-Requires(post,preun):	/sbin/chkconfig
 Requires(post):	perl-base
 Requires(post):	textutils
+Requires(post,preun):	/sbin/chkconfig
 Requires:	python-libxml2
 Requires:	python-pyxmpp
+Requires:	rc-scripts
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -83,9 +83,9 @@
 %doc README TODO *.xml
 %attr(755,root,root) %{_bindir}/*
 %{_datadir}/*
-%attr(640,root,jabber) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/jabber/*
+%attr(640,root,jabber) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/jabber/*
 %attr(754,root,root) /etc/rc.d/init.d/jjigw
-%config(noreplace) %verify(not size mtime md5) /etc/sysconfig/jjigw
+%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/jjigw
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -93,6 +93,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.4  2005/12/13 12:56:54  glen
+- adapterized (sorted %verify attrs)
+
 Revision 1.3  2004/07/31 00:01:59  maho
 - new version - 0.2.1
 - starting : ugly workaround ( daemon --fork doesn't work as one could expect )

================================================================
Index: SPECS/kannel.spec
diff -u SPECS/kannel.spec:1.23 SPECS/kannel.spec:1.24
--- SPECS/kannel.spec:1.23	Thu Oct 27 19:42:48 2005
+++ SPECS/kannel.spec	Tue Dec 13 13:56:54 2005
@@ -24,8 +24,8 @@
 Patch1:		%{name}-nolibs.patch
 URL:		http://www.kannel.org/
 BuildRequires:	ImageMagick
-BuildRequires:	automake
 BuildRequires:	autoconf
+BuildRequires:	automake
 BuildRequires:	libxml2-devel
 %{?with_mysql:BuildRequires:	mysql-devel}
 %{?with_doc:BuildRequires:	openjade}
@@ -114,9 +114,9 @@
 %attr(755,root,root) %{_bindir}/*
 %attr(755,root,root) %{_sbindir}/*
 %attr(754,root,root) /etc/rc.d/init.d/%{name}
-%config(noreplace) %verify(not size mtime md5) /etc/sysconfig/%{name}
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/kannel/kannel.conf
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/kannel/smskannel.conf
+%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/%{name}
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/kannel/kannel.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/kannel/smskannel.conf
 %dir %{_sysconfdir}/kannel
 %{_mandir}/man*/*
 
@@ -126,6 +126,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.24  2005/12/13 12:56:54  glen
+- adapterized (sorted %verify attrs)
+
 Revision 1.23  2005/10/27 17:42:48  arekm
 - rel 8
 

================================================================
Index: SPECS/kdegames.spec
diff -u SPECS/kdegames.spec:1.145 SPECS/kdegames.spec:1.146
--- SPECS/kdegames.spec:1.145	Thu Nov 24 19:52:52 2005
+++ SPECS/kdegames.spec	Tue Dec 13 13:56:54 2005
@@ -29,6 +29,7 @@
 # Source0-md5:	ba86fe9280ca57698ce3be0e0242b140
 Patch1:		kde-common-PLD.patch
 Patch2:		%{name}-disable_install-exec-hook.patch
+#BuildRequires:	unsermake
 BuildRequires:	autoconf
 BuildRequires:	automake
 %{?with_apidocs:BuildRequires:	doxygen}
@@ -36,7 +37,6 @@
 BuildRequires:	kdelibs-devel >= %{_minlibsevr}
 BuildRequires:	rpmbuild(macros) >= 1.129
 BuildRequires:	sed >= 4.0
-#BuildRequires:	unsermake
 Requires:	kdelibs >= %{_minlibsevr}
 Obsoletes:	kdegames-kabalone
 Obsoletes:	kdegames-megami
@@ -55,10 +55,10 @@
 Summary(pl):	Pliki przydatne twórcom gier dla KDE
 Summary(pt_BR):	Arquivos de inclusăo do kdegames
 Group:		X11/Development/Libraries
-Requires:	kdelibs-devel >= %{_minlibsevr}
 Requires:	%{name} = %{epoch}:%{version}-%{release}
 Requires:	%{name}-atlantik = %{epoch}:%{version}-%{release}
 Requires:	%{name}-kolf = %{epoch}:%{version}-%{release}
+Requires:	kdelibs-devel >= %{_minlibsevr}
 
 %description devel
 Development files for KDE games.
@@ -73,7 +73,7 @@
 %package apidocs
 Summary:	API documentation
 Summary(pl):	Dokumentacja API
-Group:		Development/Docs
+Group:		Documentation
 Requires:	kdelibs >= %{_minlibsevr}
 
 %description apidocs
@@ -963,7 +963,7 @@
 %files kfouleggs -f kfouleggs.lang
 %defattr(644,root,root,755)
 %if %{with highscore}
-%attr(660,root,games) %config(noreplace) %verify(not size mtime md5) /var/games/kfouleggs.scores
+%attr(660,root,games) %config(noreplace) %verify(not md5 mtime size) /var/games/kfouleggs.scores
 %attr(2755,root,games) %{_bindir}/kfouleggs
 %else
 %attr(755,root,root) %{_bindir}/kfouleggs
@@ -992,7 +992,7 @@
 %files klickety -f klickety.lang
 %defattr(644,root,root,755)
 %if %{with highscore}
-%attr(660,root,games) %config(noreplace) %verify(not size mtime md5) /var/games/klickety.scores
+%attr(660,root,games) %config(noreplace) %verify(not md5 mtime size) /var/games/klickety.scores
 %attr(2755,root,games) %{_bindir}/klickety
 %else
 %attr(755,root,root) %{_bindir}/klickety
@@ -1021,7 +1021,7 @@
 %files kmines -f kmines.lang
 %defattr(644,root,root,755)
 %if %{with highscore}
-%attr(660,root,games) %config(noreplace) %verify(not size mtime md5) /var/games/kmines.scores
+%attr(660,root,games) %config(noreplace) %verify(not md5 mtime size) /var/games/kmines.scores
 %attr(2755,root,games) %{_bindir}/kmines
 %else
 %attr(755,root,root) %{_bindir}/kmines
@@ -1102,7 +1102,7 @@
 %files ksirtet -f ksirtet.lang
 %defattr(644,root,root,755)
 %if %{with highscore}
-%attr(660,root,games) %config(noreplace) %verify(not size mtime md5) /var/games/ksirtet.scores
+%attr(660,root,games) %config(noreplace) %verify(not md5 mtime size) /var/games/ksirtet.scores
 %attr(2755,root,games) %{_bindir}/ksirtet
 %else
 %attr(755,root,root) %{_bindir}/ksirtet
@@ -1178,6 +1178,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.146  2005/12/13 12:56:54  glen
+- adapterized (sorted %verify attrs)
+
 Revision 1.145  2005/11/24 18:52:52  arekm
 - rel 1
 

================================================================
Index: SPECS/kdenetwork.spec
diff -u SPECS/kdenetwork.spec:1.200 SPECS/kdenetwork.spec:1.201
--- SPECS/kdenetwork.spec:1.200	Thu Dec  8 20:28:47 2005
+++ SPECS/kdenetwork.spec	Tue Dec 13 13:56:54 2005
@@ -3,7 +3,7 @@
 %bcond_with	skype
 %bcond_with	hidden_visibility	# pass '--fvisibility=hidden'
 					# & '--fvisibility-inlines-hidden'
-					# to g++ 
+					# to g++
 #
 %define		_state		stable
 %define		_kdever		3.5
@@ -34,6 +34,7 @@
 Patch0:		kde-common-PLD.patch
 Patch1:		%{name}-use_sendmail.patch
 Patch2:		%{name}-libgadu.patch
+#BuildRequires:	unsermake >= 040511
 BuildRequires:	autoconf
 BuildRequires:	automake
 %{?with_hidden_visibility:BuildRequires:	gcc-c++ >= 5:4.1.0-0.20051206r108118.1}
@@ -52,7 +53,6 @@
 %{?with_hidden_visibility:BuildRequires:	qt-devel >= 6:3.3.5.051113-1}
 BuildRequires:	rpmbuild(macros) >= 1.129
 BuildRequires:	sed >= 4.0
-#BuildRequires:	unsermake >= 040511
 %{?with_xmms:BuildRequires:	xmms-devel}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -101,11 +101,11 @@
 Summary:	kdenetwork header files
 Summary(pl):	Pliki nagłówkowe kdenetwork
 Group:		X11/Development/Libraries
-Requires:	kdelibs-devel >= %{_minlibsevr}
 Requires:	%{name}-libkopete_msn = %{epoch}:%{version}-%{release}
 Requires:	%{name}-libkopete_oscar = %{epoch}:%{version}-%{release}
 Requires:	%{name}-libkopete_videodevice = %{epoch}:%{version}-%{release}
 Requires:	%{name}-librss = %{epoch}:%{version}-%{release}
+Requires:	kdelibs-devel >= %{_minlibsevr}
 Obsoletes:	kdenetwork-librss-devel
 Obsoletes:	kdenetwork-rss-devel
 
@@ -246,8 +246,8 @@
 Summary:	Multi-protocol plugin-based instant messenger
 Summary(pl):	Komunikator obsługujący wiele protokołów
 Group:		X11/Applications
-Requires:	kdebase-core >= %{_minbaseevr}
 Requires:	%{name}-libkopete = %{epoch}:%{version}-%{release}
+Requires:	kdebase-core >= %{_minbaseevr}
 Obsoletes:	kdenetwork-kit
 Obsoletes:	kopete
 Obsoletes:	kopete-plugin-tools-autoaway
@@ -387,9 +387,9 @@
 Wtyczka Kopete dodająca obsługę protokołu MSN.
 
 %package kopete-protocol-meanwhile
-Summary:  Kopete plugin which adds Lotus Sametime protocol support
-Summary(pl):  Wtyczka Kopete dodająca obsługę protokołu Lotus Sametime
-Group:    X11/Applications/Networking
+Summary:	Kopete plugin which adds Lotus Sametime protocol support
+Summary(pl):	Wtyczka Kopete dodająca obsługę protokołu Lotus Sametime
+Group:		X11/Applications/Networking
<<Diff was trimmed, longer than 597 lines>>

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/jabber-mu-conference.spec?r1=1.20&r2=1.21&f=u
    http://cvs.pld-linux.org/SPECS/jabber-tlen-transport.spec?r1=1.6&r2=1.7&f=u
    http://cvs.pld-linux.org/SPECS/jakarta-tomcat.spec?r1=1.35&r2=1.36&f=u
    http://cvs.pld-linux.org/SPECS/janchor.spec?r1=1.11&r2=1.12&f=u
    http://cvs.pld-linux.org/SPECS/jboss.spec?r1=1.27&r2=1.28&f=u
    http://cvs.pld-linux.org/SPECS/jed.spec?r1=1.78&r2=1.79&f=u
    http://cvs.pld-linux.org/SPECS/jesred.spec?r1=1.12&r2=1.13&f=u
    http://cvs.pld-linux.org/SPECS/jftpgw.spec?r1=1.16&r2=1.17&f=u
    http://cvs.pld-linux.org/SPECS/jjigw.spec?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/SPECS/kannel.spec?r1=1.23&r2=1.24&f=u
    http://cvs.pld-linux.org/SPECS/kdegames.spec?r1=1.145&r2=1.146&f=u
    http://cvs.pld-linux.org/SPECS/kdenetwork.spec?r1=1.200&r2=1.201&f=u
    http://cvs.pld-linux.org/SPECS/kernel-misc-fuse.spec?r1=1.49&r2=1.50&f=u
    http://cvs.pld-linux.org/SPECS/kernel-misc-mwavem.spec?r1=1.7&r2=1.8&f=u
    http://cvs.pld-linux.org/SPECS/kgicon.spec?r1=1.25&r2=1.26&f=u
    http://cvs.pld-linux.org/SPECS/kismet.spec?r1=1.25&r2=1.26&f=u
    http://cvs.pld-linux.org/SPECS/knock.spec?r1=1.7&r2=1.8&f=u
    http://cvs.pld-linux.org/SPECS/koha.spec?r1=1.5&r2=1.6&f=u
    http://cvs.pld-linux.org/SPECS/krb5.spec?r1=1.55&r2=1.56&f=u
    http://cvs.pld-linux.org/SPECS/kudzu.spec?r1=1.32&r2=1.33&f=u




More information about the pld-cvs-commit mailing list