Remove external man pages, upstream fixed man pages license

community-mysql.spec

@@ -1,6 +1,6 @@
 Name: community-mysql
 Version: 5.5.32
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 Summary: MySQL client programs and shared libraries
 Group: Applications/Databases
@@ -18,14 +18,10 @@ License: GPLv2 with exceptions and LGPLv2 and BSD
 # represent statically.  You can get the tarball by following a link from
 # http://dev.mysql.com/downloads/mysql/
 Source0: mysql-%{version}-nodocs.tar.gz
-# The upstream tarball includes non-free documentation and man pages that
-# we cannot ship.
+# The upstream tarball includes non-free documentation that we cannot ship.
 # To remove the non-free documentation, run this script after downloading
 # the tarball into the current directory:
 # ./generate-tarball.sh $VERSION
-# man pages were licensed under GPL until 5.5.30, so we use man pages from
-# that version instead of files from current source tarball
-Source1: mysql-man-gpl.tar.gz
 Source2: generate-tarball.sh
 Source3: my.cnf
 Source5: my_config.h
@@ -63,6 +59,7 @@ Patch20: community-mysql-string-overflow.patch
 Patch21: community-mysql-dh1024.patch
 Patch22: community-mysql-major.patch
 Patch23: community-mysql-sharedir.patch
+Patch24: community-mysql-man-pages.patch
 Patch25: community-mysql-tmpdir.patch
 Patch26: community-mysql-cve-2013-1861.patch
 Patch27: community-mysql-innodbwarn.patch
@@ -227,8 +224,6 @@ the MySQL sources.
 %prep
 %setup -q -n mysql-%{version}
 
-tar -xvf %{SOURCE1}
-
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
@@ -249,6 +244,7 @@ tar -xvf %{SOURCE1}
 %patch21 -p1
 %patch22 -p1
 %patch23 -p1
+%patch24 -p1
 %patch25 -p1
 %patch26 -p1
 %patch27 -p1
@@ -715,6 +711,9 @@ rm -f ${RPM_BUILD_ROOT}%{_datadir}/mysql/solaris/postinstall-solaris
 %{_mandir}/man1/mysql_client_test.1*
 
 %changelog
+* Thu Jun 27 2013 Honza Horak <hhorak@redhat.com> 5.5.32-4
+- Remove external man pages, upstream fixed man pages license
+
 * Fri Jun 14 2013 Honza Horak <hhorak@redhat.com> 5.5.32-3
 - Use man pages from 5.5.30, because their license do not
   allow us to ship them since 5.5.31

generate-tarball.sh

@@ -7,7 +7,6 @@ rm -rf mysql-$VERSION
 tar xfz mysql-$VERSION.tar.gz || exit 1
 
 rm mysql-$VERSION/Docs/mysql.info
-rm mysql-$VERSION/man/*
 
 tar cfz mysql-$VERSION-nodocs.tar.gz mysql-$VERSION || exit 1
 

sources

@@ -1,2 +1 @@
-55b008d92abd01cd553021346a0da853  mysql-5.5.32-nodocs.tar.gz
-5e9973ed0c74c3888620290c82514812  mysql-man-gpl.tar.gz
+2ce2dd09ec4c69e6fc5b3dabf70a333d  mysql-5.5.32-nodocs.tar.gz