Skip to content

Commit ff3d230

Browse files
author
Joerg Bruehe
committed
Bug#37098 Get rid of "Installed (but unpackaged)" files in the RPM build
Mostly, this affected files (programs, scripts, and manual pages) which got built during a RPM build but were not listed in the appropriate "%files" section of the "spec" file. This is fixed now, they are added. To make this consistent, this patch also makes the build of "innochecksum" (and its inclusion in a tar.gz or other package) depend on whether InnoDB is configured in the build. Also, some tools to create Windows packages are irrelevant in any binary Unix package (not the sources !), and so they are deleted before packaging.
1 parent a0768d3 commit ff3d230

5 files changed

Lines changed: 41 additions & 1 deletion

File tree

‎configure.in‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2810,6 +2810,9 @@ EOF
28102810
AC_CONFIG_SUBDIRS(innobase)
28112811
fi
28122812

2813+
# "innochecksum" is not in the "innobase/" subdirectory, but should be switched
2814+
AM_CONDITIONAL([BUILD_INNODB_TOOLS], [test X"$have_innodb" = Xyes])
2815+
28132816
case $SYSTEM_TYPE-$MACHINE_TYPE-$ac_cv_prog_gcc-$have_ndbcluster in
28142817
*solaris*-i?86-no-yes)
28152818
if $CC -xildon 2>&1 | grep "illegal option" >/dev/null

‎extra/Makefile.am‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,12 @@ $(top_builddir)/include/mysqld_ername.h: $(top_builddir)/include/mysqld_error.h
4545
$(top_builddir)/include/sql_state.h: $(top_builddir)/include/mysqld_error.h
4646

4747
bin_PROGRAMS = replace comp_err perror resolveip my_print_defaults \
48-
resolve_stack_dump mysql_waitpid innochecksum
48+
resolve_stack_dump mysql_waitpid
49+
# "innochecksum" should be switched
50+
if BUILD_INNODB_TOOLS
51+
bin_PROGRAMS += innochecksum
52+
endif
53+
4954
noinst_PROGRAMS = charset2html
5055
EXTRA_DIST = CMakeLists.txt
5156

‎man/Makefile.am‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,11 @@ man1_MANS = @man1_files@
2121
man8_MANS = @man8_files@
2222
EXTRA_DIST = $(man1_MANS) $(man8_MANS)
2323

24+
# 1) not needed in Unix binary packages,
25+
# 2) programs not generated in 5.0:
26+
install-data-hook:
27+
rm -f $(DESTDIR)$(manlibdir)/man1/make_win_*
28+
rm -f $(DESTDIR)$(manlibdir)/man1/ndb_print_*
29+
2430
# Don't update the files from bitkeeper
2531
%::SCCS/s.%

‎scripts/make_binary_distribution.sh‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -272,6 +272,8 @@ if [ $BASE_SYSTEM != "netware" ] ; then
272272
if [ -d man ] ; then
273273
$CP man/*.1 $BASE/man/man1
274274
$CP man/*.8 $BASE/man/man8
275+
# In a Unix binary package, these tools and their manuals are not useful
276+
rm -f $BASE/man/man1/make_win_*
275277
fi
276278
fi
277279

@@ -331,6 +333,7 @@ fi
331333

332334
rm -f $BASE/bin/Makefile* $BASE/bin/*.in $BASE/bin/*.sh \
333335
$BASE/bin/mysql_install_db $BASE/bin/make_binary_distribution \
336+
$BASE/bin/make_win_* \
334337
$BASE/bin/setsomevars $BASE/support-files/Makefile* \
335338
$BASE/support-files/*.sh
336339

‎support-files/mysql.spec.sh‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -591,6 +591,7 @@ fi
591591

592592
%doc %attr(644, root, root) %{_infodir}/mysql.info*
593593

594+
%doc %attr(644, root, man) %{_mandir}/man1/innochecksum.1*
594595
%doc %attr(644, root, man) %{_mandir}/man1/my_print_defaults.1*
595596
%doc %attr(644, root, man) %{_mandir}/man1/myisam_ftdump.1*
596597
%doc %attr(644, root, man) %{_mandir}/man1/myisamchk.1*
@@ -610,13 +611,15 @@ fi
610611
%doc %attr(644, root, man) %{_mandir}/man1/mysqltest.1*
611612
%doc %attr(644, root, man) %{_mandir}/man1/mysql_tzinfo_to_sql.1*
612613
%doc %attr(644, root, man) %{_mandir}/man1/mysql_zap.1*
614+
%doc %attr(644, root, man) %{_mandir}/man1/mysqlbug.1*
613615
%doc %attr(644, root, man) %{_mandir}/man1/perror.1*
614616
%doc %attr(644, root, man) %{_mandir}/man1/replace.1*
615617
%doc %attr(644, root, man) %{_mandir}/man1/safe_mysqld.1*
616618

617619
%ghost %config(noreplace,missingok) %{_sysconfdir}/my.cnf
618620
%ghost %config(noreplace,missingok) %{_sysconfdir}/mysqlmanager.passwd
619621

622+
%attr(755, root, root) %{_bindir}/innochecksum
620623
%attr(755, root, root) %{_bindir}/my_print_defaults
621624
%attr(755, root, root) %{_bindir}/myisam_ftdump
622625
%attr(755, root, root) %{_bindir}/myisamchk
@@ -661,6 +664,7 @@ fi
661664
%attr(755, root, root) %{_bindir}/mysql
662665
%attr(755, root, root) %{_bindir}/mysql_find_rows
663666
%attr(755, root, root) %{_bindir}/mysql_tableinfo
667+
%attr(755, root, root) %{_bindir}/mysql_upgrade_shell
664668
%attr(755, root, root) %{_bindir}/mysql_waitpid
665669
%attr(755, root, root) %{_bindir}/mysqlaccess
666670
%attr(755, root, root) %{_bindir}/mysqladmin
@@ -672,6 +676,8 @@ fi
672676

673677
%doc %attr(644, root, man) %{_mandir}/man1/msql2mysql.1*
674678
%doc %attr(644, root, man) %{_mandir}/man1/mysql.1*
679+
%doc %attr(644, root, man) %{_mandir}/man1/mysql_find_rows.1*
680+
%doc %attr(644, root, man) %{_mandir}/man1/mysql_tableinfo.1*
675681
%doc %attr(644, root, man) %{_mandir}/man1/mysqlaccess.1*
676682
%doc %attr(644, root, man) %{_mandir}/man1/mysqladmin.1*
677683
%doc %attr(644, root, man) %{_mandir}/man1/mysqlbinlog.1*
@@ -713,6 +719,8 @@ fi
713719
%doc %attr(644, root, man) %{_mandir}/man1/ndb_config.1*
714720
%doc %attr(644, root, man) %{_mandir}/man1/ndb_desc.1*
715721
%doc %attr(644, root, man) %{_mandir}/man1/ndb_error_reporter.1*
722+
%doc %attr(644, root, man) %{_mandir}/man1/ndb_mgm.1*
723+
%doc %attr(644, root, man) %{_mandir}/man1/ndb_restore.1*
716724
%doc %attr(644, root, man) %{_mandir}/man1/ndb_select_all.1*
717725
%doc %attr(644, root, man) %{_mandir}/man1/ndb_select_count.1*
718726
%doc %attr(644, root, man) %{_mandir}/man1/ndb_show_tables.1*
@@ -724,13 +732,16 @@ fi
724732
%attr(755, root, root) %{_bindir}/ndb_delete_all
725733
%attr(755, root, root) %{_bindir}/ndb_drop_index
726734
%attr(755, root, root) %{_bindir}/ndb_drop_table
735+
%attr(755, root, root) %{_sbindir}/ndb_cpcd
727736
%doc %attr(644, root, man) %{_mandir}/man1/ndb_delete_all.1*
728737
%doc %attr(644, root, man) %{_mandir}/man1/ndb_drop_index.1*
729738
%doc %attr(644, root, man) %{_mandir}/man1/ndb_drop_table.1*
739+
%doc %attr(644, root, man) %{_mandir}/man1/ndb_cpcd.1*
730740

731741
%files devel
732742
%defattr(-, root, root, 0755)
733743
%doc EXCEPTIONS-CLIENT
744+
%doc %attr(644, root, man) %{_mandir}/man1/comp_err.1*
734745
%doc %attr(644, root, man) %{_mandir}/man1/mysql_config.1*
735746
%attr(755, root, root) %{_bindir}/comp_err
736747
%attr(755, root, root) %{_bindir}/mysql_config
@@ -784,6 +795,18 @@ fi
784795
# itself - note that they must be ordered by date (important when
785796
# merging BK trees)
786797
%changelog
798+
* Mon Aug 18 2008 Joerg Bruehe <[email protected]>
799+
800+
- Get rid of the "warning: Installed (but unpackaged) file(s) found:"
801+
Some files were missing:
802+
- Manual "mysqlbug" ("server" subpackage)
803+
- Program "innochecksum" and its manual ("server" subpackage)
804+
- Manuals "mysql_find_rows" + "mysql_tableinfo" ("client" subpackage)
805+
- Script "mysql_upgrade_shell" ("client" subpackage)
806+
- Manual "comp_err" ("devel" subpackage)
807+
- Program "ndb_cpcd" and its manual ("ndb-extra" subpackage)
808+
- Manuals "ndb_mgm" + "ndb_restore" ("ndb-tools" subpackage)
809+
787810
* Wed Mar 19 2008 Joerg Bruehe <[email protected]>
788811

789812
- Add the man pages for "ndbd" and "ndb_mgmd".

0 commit comments

Comments
 (0)