Skip to content

Commit 811337d

Browse files
author
Joerg Bruehe
committed
Bug#37098 Get rid of "Installed (but unpackaged)" files in the RPM build
Merge it up from 5.0 to 5.1, adapt to some version differences.
2 parents 3d21555 + ff3d230 commit 811337d

5 files changed

Lines changed: 44 additions & 2 deletions

File tree

‎configure.in‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2722,6 +2722,9 @@ then
27222722
sql_server="vio sql"
27232723
fi
27242724

2725+
# "innochecksum" is not in the "innobase/" subdirectory, but should be switched
2726+
AM_CONDITIONAL([BUILD_INNODB_TOOLS], [test X"$with_plugin_innobase" = Xyes])
2727+
27252728
# IMPORTANT - do not modify LIBS past this line - this hack is the only way
27262729
# I know to add the static NSS magic if we have static NSS libraries with
27272730
# glibc - Sasha

‎extra/Makefile.am‎

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

4545
bin_PROGRAMS = replace perror resolveip my_print_defaults \
46-
resolve_stack_dump mysql_waitpid innochecksum
46+
resolve_stack_dump mysql_waitpid
47+
# "innochecksum" should be switched
48+
if BUILD_INNODB_TOOLS
49+
bin_PROGRAMS += innochecksum
50+
endif
51+
4752
noinst_PROGRAMS = charset2html
4853
EXTRA_PROGRAMS = comp_err
4954
EXTRA_DIST = CMakeLists.txt

‎man/Makefile.am‎

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

24+
# "make_win_*" are not needed in Unix binary packages,
25+
install-data-hook:
26+
rm -f $(DESTDIR)$(manlibdir)/man1/make_win_*
27+
2428
# Don't update the files from bitkeeper
2529
%::SCCS/s.%

‎scripts/make_binary_distribution.sh‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -385,6 +385,9 @@ copyfileto $BASE/include config.h include/*
385385

386386
rm -f $BASE/include/Makefile* $BASE/include/*.in $BASE/include/config-win.h
387387

388+
# In a NetWare binary package, these tools and their manuals are not useful
389+
rm -f $BASE/man/man1/make_win_*
390+
388391
copyfileto $BASE/support-files support-files/*
389392

390393
copyfileto $BASE/share scripts/*.sql
@@ -427,6 +430,7 @@ fi
427430

428431
rm -f $BASE/bin/Makefile* $BASE/bin/*.in $BASE/bin/*.sh \
429432
$BASE/bin/mysql_install_db $BASE/bin/make_binary_distribution \
433+
$BASE/bin/make_win_* \
430434
$BASE/bin/setsomevars $BASE/support-files/Makefile* \
431435
$BASE/support-files/*.sh
432436

‎support-files/mysql.spec.sh‎

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -445,6 +445,9 @@ install -m 755 $MBD/support-files/mysql.server $RBR%{_sysconfdir}/init.d/mysql
445445
# Install embedded server library in the build root
446446
install -m 644 $MBD/libmysqld/libmysqld.a $RBR%{_libdir}/mysql/
447447

448+
# in RPMs, it is unlikely that anybody should use "sql-bench"
449+
rm -fr $RBR%{_datadir}/sql-bench
450+
448451
# Create a symlink "rcmysql", pointing to the init.script. SuSE users
449452
# will appreciate that, as all services usually offer this.
450453
ln -s %{_sysconfdir}/init.d/mysql $RPM_BUILD_ROOT%{_sbindir}/rcmysql
@@ -636,6 +639,7 @@ fi
636639

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

642+
%doc %attr(644, root, man) %{_mandir}/man1/innochecksum.1*
639643
%doc %attr(644, root, man) %{_mandir}/man1/my_print_defaults.1*
640644
%doc %attr(644, root, man) %{_mandir}/man1/myisam_ftdump.1*
641645
%doc %attr(644, root, man) %{_mandir}/man1/myisamchk.1*
@@ -654,12 +658,14 @@ fi
654658
%doc %attr(644, root, man) %{_mandir}/man1/mysqltest.1*
655659
%doc %attr(644, root, man) %{_mandir}/man1/mysql_tzinfo_to_sql.1*
656660
%doc %attr(644, root, man) %{_mandir}/man1/mysql_zap.1*
661+
%doc %attr(644, root, man) %{_mandir}/man1/mysqlbug.1*
657662
%doc %attr(644, root, man) %{_mandir}/man1/perror.1*
658663
%doc %attr(644, root, man) %{_mandir}/man1/replace.1*
659664

660665
%ghost %config(noreplace,missingok) %{_sysconfdir}/my.cnf
661666
%ghost %config(noreplace,missingok) %{_sysconfdir}/mysqlmanager.passwd
662667

668+
%attr(755, root, root) %{_bindir}/innochecksum
663669
%attr(755, root, root) %{_bindir}/my_print_defaults
664670
%attr(755, root, root) %{_bindir}/myisam_ftdump
665671
%attr(755, root, root) %{_bindir}/myisamchk
@@ -700,6 +706,7 @@ fi
700706
%attr(755, root, root) %{_bindir}/msql2mysql
701707
%attr(755, root, root) %{_bindir}/mysql
702708
%attr(755, root, root) %{_bindir}/mysql_find_rows
709+
%attr(755, root, root) %{_bindir}/mysql_upgrade_shell
703710
%attr(755, root, root) %{_bindir}/mysql_waitpid
704711
%attr(755, root, root) %{_bindir}/mysqlaccess
705712
%attr(755, root, root) %{_bindir}/mysqladmin
@@ -712,6 +719,7 @@ fi
712719

713720
%doc %attr(644, root, man) %{_mandir}/man1/msql2mysql.1*
714721
%doc %attr(644, root, man) %{_mandir}/man1/mysql.1*
722+
%doc %attr(644, root, man) %{_mandir}/man1/mysql_find_rows.1*
715723
%doc %attr(644, root, man) %{_mandir}/man1/mysqlaccess.1*
716724
%doc %attr(644, root, man) %{_mandir}/man1/mysqladmin.1*
717725
%doc %attr(644, root, man) %{_mandir}/man1/mysqlbinlog.1*
@@ -757,6 +765,8 @@ fi
757765
%doc %attr(644, root, man) %{_mandir}/man1/ndb_config.1*
758766
%doc %attr(644, root, man) %{_mandir}/man1/ndb_desc.1*
759767
%doc %attr(644, root, man) %{_mandir}/man1/ndb_error_reporter.1*
768+
%doc %attr(644, root, man) %{_mandir}/man1/ndb_mgm.1*
769+
%doc %attr(644, root, man) %{_mandir}/man1/ndb_restore.1*
760770
%doc %attr(644, root, man) %{_mandir}/man1/ndb_print_backup_file.1*
761771
%doc %attr(644, root, man) %{_mandir}/man1/ndb_print_schema_file.1*
762772
%doc %attr(644, root, man) %{_mandir}/man1/ndb_print_sys_file.1*
@@ -768,13 +778,14 @@ fi
768778

769779
%files ndb-extra
770780
%defattr(-,root,root,0755)
771-
%attr(755, root, root) %{_sbindir}/ndb_cpcd
772781
%attr(755, root, root) %{_bindir}/ndb_delete_all
773782
%attr(755, root, root) %{_bindir}/ndb_drop_index
774783
%attr(755, root, root) %{_bindir}/ndb_drop_table
784+
%attr(755, root, root) %{_sbindir}/ndb_cpcd
775785
%doc %attr(644, root, man) %{_mandir}/man1/ndb_delete_all.1*
776786
%doc %attr(644, root, man) %{_mandir}/man1/ndb_drop_index.1*
777787
%doc %attr(644, root, man) %{_mandir}/man1/ndb_drop_table.1*
788+
%doc %attr(644, root, man) %{_mandir}/man1/ndb_cpcd.1*
778789
%endif
779790

780791
%files devel
@@ -785,6 +796,7 @@ fi
785796
%dir %attr(755, root, root) %{_includedir}/mysql
786797
%dir %attr(755, root, root) %{_libdir}/mysql
787798
%{_includedir}/mysql/*
799+
%{_datadir}/aclocal/mysql.m4
788800
%{_libdir}/mysql/libdbug.a
789801
%{_libdir}/mysql/libheap.a
790802
%if %{have_libgcc}
@@ -834,6 +846,20 @@ fi
834846
# itself - note that they must be ordered by date (important when
835847
# merging BK trees)
836848
%changelog
849+
* Tue Aug 26 2008 Joerg Bruehe <[email protected]>
850+
851+
- Get rid of the "warning: Installed (but unpackaged) file(s) found:"
852+
Some generated files aren't needed in RPMs:
853+
- the "sql-bench/" subdirectory
854+
Some files were missing:
855+
- /usr/share/aclocal/mysql.m4 ("devel" subpackage)
856+
- Manual "mysqlbug" ("server" subpackage)
857+
- Program "innochecksum" and its manual ("server" subpackage)
858+
- Manual "mysql_find_rows" ("client" subpackage)
859+
- Script "mysql_upgrade_shell" ("client" subpackage)
860+
- Program "ndb_cpcd" and its manual ("ndb-extra" subpackage)
861+
- Manuals "ndb_mgm" + "ndb_restore" ("ndb-tools" subpackage)
862+
837863
* Mon Mar 31 2008 Kent Boortz <[email protected]>
838864
839865
- Made the "Federated" storage engine an option

0 commit comments

Comments
 (0)