SPECS: mysql.spec - missing dir, unified preambles/files order

qboosh qboosh at pld-linux.org
Fri Feb 10 18:41:38 CET 2006


Author: qboosh                       Date: Fri Feb 10 17:41:38 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- missing dir, unified preambles/files order

---- Files affected:
SPECS:
   mysql.spec (1.322 -> 1.323) 

---- Diffs:

================================================================
Index: SPECS/mysql.spec
diff -u SPECS/mysql.spec:1.322 SPECS/mysql.spec:1.323
--- SPECS/mysql.spec:1.322	Fri Feb 10 18:08:12 2006
+++ SPECS/mysql.spec	Fri Feb 10 18:41:31 2006
@@ -81,8 +81,8 @@
 Requires(pre):	/usr/sbin/groupadd
 Requires(pre):	/usr/sbin/useradd
 Requires(triggerpostun):	sed >= 4.0
-Requires:	/usr/bin/setsid
 Requires:	%{name}-charsets = %{version}-%{release}
+Requires:	/usr/bin/setsid
 Requires:	rc-scripts >= 0.2.0
 Provides:	MySQL-server
 Provides:	group(mysql)
@@ -199,6 +199,19 @@
 ÄÉÓÔŇÉÂŐÔÉ׌ ÄĚŃ ŚÎĆĎŇÍÁĂŚ§ ĐŇĎ ŚÎŰÉČ ŐŢÁÓÎÉËŚ× ĐŇĎĹËÔŐ ÔÁ ŚÎŰϧ
 ŚÎĆĎŇÍÁĂŚ§.
 
+%package charsets
+Summary:	MySQL - character sets definitions
+Summary(pl):	MySQL - definicje kodowań znaków
+Group:		Applications/Databases
+
+%description charsets
+This package contains character sets definitions needed by both client
+and server.
+
+%description charsets -l pl
+Ten pakiet zawiera definicje kodowań znaków potrzebne dla serwera i
+klienta.
+
 %package extras
 Summary:	MySQL additional utilities
 Summary(pl):	Dodatkowe narzędzia do MySQL
@@ -417,19 +430,6 @@
 %description ndb-cpc -l pl
 Ten pakiet zawiera standardowego demona MySQL NDB CPC.
 
-%package charsets
-Summary:	MySQL - character sets definitions
-Summary(pl):	MySQL - definicje kodowań znaków
-Group:		Applications/Databases
-
-%description charsets
-This package contains character sets definitions needed by
-both client and server.
-
-%description charsets -l pl
-Ten pakiet zawiera definicje kodowań znaków potrzebne dla
-serwera i klienta.
-
 %prep
 %setup -q %{?_snap:-n %{name}-%{version}-nightly-%{_snap}}
 %patch0 -p1
@@ -441,6 +441,7 @@
 # so -rdynamic is used; in such case gcc3+ld on alpha doesn't like C++ vtables
 # in objects compiled without -fPIC
 %patch4 -p1
+# gcc 3.3.x ICE
 %patch10 -p1
 %endif
 %patch5 -p1
@@ -767,7 +768,6 @@
 %attr(640,mysql,mysql) %ghost /var/log/mysql/*
 
 %{_infodir}/mysql.info*
-%dir %{_datadir}/mysql
 # This is template for configuration file which is created after 'service mysql init'
 %{_datadir}/mysql/mysqld.conf
 %{_datadir}/mysql/english
@@ -797,6 +797,7 @@
 
 %files charsets
 %defattr(644,root,root,755)
+%dir %{_datadir}/mysql
 %{_datadir}/mysql/charsets
 
 %files extras
@@ -854,7 +855,7 @@
 %doc EXCEPTIONS-CLIENT
 %attr(755,root,root) %{_libdir}/lib*.so.*.*
 %attr(751,root,root) %dir %{_sysconfdir}/mysql
-%attr(644,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/mysql/mysql-client.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/mysql/mysql-client.conf
 
 %files devel
 %defattr(644,root,root,755)
@@ -915,6 +916,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.323  2006/02/10 17:41:31  qboosh
+- missing dir, unified preambles/files order
+
 Revision 1.322  2006/02/10 17:08:12  baggins
 - release 3
 - charsets definitions are needed by both client and server
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/mysql.spec?r1=1.322&r2=1.323&f=u



More information about the pld-cvs-commit mailing list