From 64e9b34432abc40eff43a03798db45d757d6ca7d Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Mon, 5 Jan 2009 23:15:21 +0100 Subject: Various packaging fixed from review (#225246) Various packaging fixed from review (#225246) --- Makefile | 6 +++++- anaconda.spec | 50 +++++++++++++++++++++----------------------- bootdisk/i386/syslinux.cfg | 0 bootdisk/x86_64/syslinux.cfg | 0 filer.py | 2 -- gui.py | 0 installclasses/Makefile | 2 +- isys/Makefile | 2 +- iw/Makefile | 2 +- scripts/Makefile | 21 ++++++++++--------- scripts/mk-images.efi | 1 - scripts/mk-images.ia64 | 1 - scripts/pyrc.py | 0 sortedtransaction.py | 1 - textw/Makefile | 2 +- ui/Makefile | 2 +- 16 files changed, 45 insertions(+), 47 deletions(-) mode change 100755 => 100644 bootdisk/i386/syslinux.cfg mode change 100755 => 100644 bootdisk/x86_64/syslinux.cfg mode change 100755 => 100644 gui.py mode change 100755 => 100644 scripts/mk-images.efi mode change 100755 => 100644 scripts/pyrc.py diff --git a/Makefile b/Makefile index 5f7a930bf..af327216a 100644 --- a/Makefile +++ b/Makefile @@ -108,7 +108,7 @@ tag: ChangeLog: (GIT_DIR=.git git log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2) -archive: tag +archive-no-tag: @rm -f ChangeLog docs/kickstart-docs.txt docs/command-line.txt @make ChangeLog @make -C docs kickstart-docs.txt command-line.txt @@ -120,6 +120,10 @@ archive: tag @bzip2 -f anaconda-$(VERSION).tar @rm -rf anaconda-$(VERSION) +archive: + @make tag + @make archive-no-tag + src: archive @rpmbuild -ts --nodeps anaconda-$(VERSION).tar.bz2 || exit 1 @rm -f anaconda-$(VERSION).tar.bz2 diff --git a/anaconda.spec b/anaconda.spec index 5a66b491a..2767ecf09 100644 --- a/anaconda.spec +++ b/anaconda.spec @@ -8,6 +8,10 @@ License: GPLv2+ Group: Applications/System URL: http://fedoraproject.org/wiki/Anaconda +# To generate Source0 do: +# git clone http://git.fedorahosted.org/git/anaconda.git +# git checkout -b archive-branch anaconda-%{version}-%{release} +# make archive-no-tag Source0: %{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -29,7 +33,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %define syscfgdatever 1.9.0 %define pythonpyblockver 0.24-1 %define libbdevidver 5.1.2-1 -%define desktopfileutilsver 0.8 %define e2fsver 1.41.0 %define nmver 0.7.0 %define dbusver 1.2.3 @@ -97,7 +100,6 @@ Requires: dmidecode Requires: python-pyblock >= %{pythonpyblockver} Requires: libbdevid >= %{libbdevidver} Requires: libbdevid-python -Requires: audit-libs Requires: libuser-python Requires: newt-python Requires: authconfig @@ -116,8 +118,6 @@ Requires: python-bugzilla %ifarch %livearches Requires: usermode Requires: zenity -Requires(post): desktop-file-utils >= %{desktopfileutilsver} -Requires(postun): desktop-file-utils >= %{desktopfileutilsver} %endif Requires: createrepo >= %{createrepover} Requires: squashfs-tools @@ -138,6 +138,7 @@ Requires: dhclient Requires: dhcpv6-client Requires: anaconda-yum-plugins Obsoletes: anaconda-images <= 10 +Provides: anaconda-images = %{version}-%{release} Obsoletes: anaconda-runtime < %{version}-%{release} Provides: anaconda-runtime = %{version}-%{release} @@ -167,12 +168,12 @@ desktop-file-install --vendor="" --dir=%{buildroot}%{_datadir}/applications %{bu %ifarch %livearches %post -/usr/bin/update-desktop-database %{_datadir}/applications +update-desktop-database &> /dev/null || : %endif %ifarch %livearches %postun -/usr/bin/update-desktop-database %{_datadir}/applications +update-desktop-database &> /dev/null || : %endif %files -f %{name}.lang @@ -196,15 +197,12 @@ desktop-file-install --vendor="" --dir=%{buildroot}%{_datadir}/applications %{bu %ifarch %livearches %{_bindir}/liveinst %{_sbindir}/liveinst -%{_sysconfdir}/pam.d/* +%config(noreplace) %{_sysconfdir}/pam.d/* +%config(noreplace) %{_sysconfdir}/security/console.apps/* %{_sysconfdir}/X11/xinit/xinitrc.d/* -%{_sysconfdir}/security/console.apps/* %{_datadir}/applications/*.desktop %endif -%triggerun -- anaconda < 8.0-1 -/sbin/chkconfig --del reconfig >/dev/null 2>&1 || : - %changelog * Tue Dec 23 2008 David Cantrell - 11.5.0.3-1 - Initialize domainname to None (#477831) (dcantrell) @@ -903,7 +901,7 @@ desktop-file-install --vendor="" --dir=%{buildroot}%{_datadir}/applications %{bu - Remove extra ')' in install-buildrequires (dcantrell) * Mon Aug 11 2008 Chris Lumens - 11.4.1.27-1 -- Handle 'rescue' and %post in rescue mode (atodorov) +- Handle 'rescue' and %%post in rescue mode (atodorov) - Delay the duplicate label error until the label is actually used (#458505). (clumens) - Enable wireless modules again for now as a test (#443545). (clumens) @@ -1073,7 +1071,7 @@ desktop-file-install --vendor="" --dir=%{buildroot}%{_datadir}/applications %{bu - Don't strip too much off the NFS directory path. (clumens) - Log stage2 url better. (pjones) - Fix minor whitespace nits. (pjones) -- Use %m rather than strerror() where appropriate. (pjones) +- Use %%m rather than strerror() where appropriate. (pjones) - Make setupCdrom() actually return the path to the stage2 image it found. (pjones) - Don't unconditionally pass --lang for live installs (#454101) (katzj) @@ -1427,7 +1425,7 @@ desktop-file-install --vendor="" --dir=%{buildroot}%{_datadir}/applications %{bu * Wed Apr 02 2008 Chris Lumens - 11.4.0.65-1 - Only do verbose hal logging if loglevel=debug (katzj) - Avoid AttributeError in HardDriveDict (#432362) (pjones) -- Don't use %n with gettext to avoid segfaults (#439861) (katzj) +- Don't use %%n with gettext to avoid segfaults (#439861) (katzj) - Require live installs to be to an ext2 or ext3 filesystem (#397871) (katzj) - Don't allow migrations to ext4 for now (katzj) - Change ext4 parameter to ext4, not iamanext4developer (katzj) @@ -1809,7 +1807,7 @@ desktop-file-install --vendor="" --dir=%{buildroot}%{_datadir}/applications %{bu - remove yumcache (katzj) - Don't do fixmtimes anymore (katzj) - Don't compress translations (katzj) -- Don't manually duplicate things from package %post scripts (katzj) +- Don't manually duplicate things from package %%post scripts (katzj) - Remove some unused options (--discs and --buildinstdir) (katzj) - Keep /etc/nsswitch.conf and /etc/shells (katzj) - Stop forcing passive mode for FTP by patching urllib (katzj) @@ -2140,7 +2138,7 @@ desktop-file-install --vendor="" --dir=%{buildroot}%{_datadir}/applications %{bu - Add linear.ko to the modules available for rescue mode (#151742). - Update implantisomd5 usage to give correct option name (#364611). - Start removing unneeded install method code. -- Run %post scripts on upgrade (#392201). +- Run %%post scripts on upgrade (#392201). - Correct nicdelay patch (msivak, #349521). - Only run media check if we're installing off the CD (#362561). - Fix display of package names in non-English text installs (#376231). @@ -2620,7 +2618,7 @@ desktop-file-install --vendor="" --dir=%{buildroot}%{_datadir}/applications %{bu - Fix for mirror errors (dlehman) - Fix splittree (Joel Andres Granados, #233384) - Fix ppc32 netboot (pnasrat, #237988) -- Fix %packages for media installs (clumens, #231121, #235881) +- Fix %%packages for media installs (clumens, #231121, #235881) - Fix rescue mode networking (dcantrell, #238080) - Adjust for unbreaking the yum API - Fix rescue mode traceback (#238261) @@ -2832,7 +2830,7 @@ desktop-file-install --vendor="" --dir=%{buildroot}%{_datadir}/applications %{bu - BR newt-static * Thu Mar 01 2007 Chris Lumens - 11.2.0.28-1 -- Support multiple %ksappend lines (#222201). +- Support multiple %%ksappend lines (#222201). - Set the ksdata after setting the initial timezone values (#230472). - New progress screen interface that's easier on backends (katzj). - Handle KickstartError exns better than just dumping a backtrace. @@ -2956,7 +2954,7 @@ desktop-file-install --vendor="" --dir=%{buildroot}%{_datadir}/applications %{bu * Fri Jan 19 2007 Chris Lumens - 11.2.0.13-1 - Kickstart and upgrade are no longer installclasses. - Update x86_64 syslinux config (katzj). -- Support %packages --default (#221305). +- Support %%packages --default (#221305). - Fix early kickstart UI traceback. - Remove cruft in x86 images (katzj). - Fix error handling in loader netconfig screen (dcantrell). @@ -3066,7 +3064,7 @@ desktop-file-install --vendor="" --dir=%{buildroot}%{_datadir}/applications %{bu - Update kickstart documentation. - Don't always write out xconfig and monitor in anaconda-ks.cfg (#211977). - Follow drive order specified in kickstart file (#214881). -- Unmount source on image installs before %post is run (#214677). +- Unmount source on image installs before %%post is run (#214677). - Check return value of getBiosDisk (pjones, #214653). - splittree shouldn't fail with non-rpms in the directory (jkeating). - Order bind mounts correctly on upgrades (#212270). @@ -4540,7 +4538,7 @@ desktop-file-install --vendor="" --dir=%{buildroot}%{_datadir}/applications %{bu - Move repo setup and group selection earlier (pnasrat) * Tue Sep 20 2005 Jeremy Katz - 10.3.0.24-1 -- Some kickstart %packages fixes (clumens) +- Some kickstart %%packages fixes (clumens) - Don't copy null bytes into syslog (clumens) - New exception dialog (clumens) - Fix a traceback (pnasrat) @@ -4994,7 +4992,7 @@ desktop-file-install --vendor="" --dir=%{buildroot}%{_datadir}/applications %{bu * Sat Feb 12 2005 Jeremy Katz - 10.2.0.19-1 - fix x86_64 installs for bad urlgrabber import -- Fix traceback with no %post (clumens) +- Fix traceback with no %%post (clumens) - Put hostname in the text entry (clumens, #132826) * Tue Feb 8 2005 Jeremy Katz - 10.2.0.18-1 @@ -5003,7 +5001,7 @@ desktop-file-install --vendor="" --dir=%{buildroot}%{_datadir}/applications %{bu - Add needed requirements for rpm 4.4 - Fix segfault when rpm tries to write to non-existent fd during transaction ordering -- Support --erroronfail as an option for %pre/%post (clumens, #124386) +- Support --erroronfail as an option for %%pre/%%post (clumens, #124386) * Tue Feb 8 2005 Jeremy Katz - 10.2.0.17-1 - Use rhpl.archscore to fix iseries upgrades (pnasrat, #146915) @@ -5190,7 +5188,7 @@ desktop-file-install --vendor="" --dir=%{buildroot}%{_datadir}/applications %{bu - Update for new Indic font filenames * Mon Oct 18 2004 Jeremy Katz - 10.0.3.20-1 -- Fix traceback with %post logging (Gijs Hollestelle, #136154) +- Fix traceback with %%post logging (Gijs Hollestelle, #136154) - When using a local stage2.img for FTP/HTTP install, give an error earlier if you point at an invalid tree (#135603, #117155, #120101) - Add a trailing newline to /etc/sysconfig/kernel @@ -5201,7 +5199,7 @@ desktop-file-install --vendor="" --dir=%{buildroot}%{_datadir}/applications %{bu - Fix font size to fit on disk display better (#135731) - Write out part lines for autopart lvm correctly (#135714) - Remove empty row in drive order for boot loader (#135944) -- Replace % in URLs to avoid format string weirdness (#135929) +- Replace %% in URLs to avoid format string weirdness (#135929) - Bind mount /dev for rescue mode (#135860) - Fix Dutch and Danish keyboard defaults (#135839) - add s2io 10GbE driver @@ -5249,7 +5247,7 @@ desktop-file-install --vendor="" --dir=%{buildroot}%{_datadir}/applications %{bu * Mon Oct 4 2004 Jeremy Katz - 10.0.3.11-1 - Handle 32 raid devs (#134438) - Fix LCS PORTNAME (#134487) -- Add logging of kickstart scripts with --log to %post/%pre +- Add logging of kickstart scripts with --log to %%post/%%pre - Copy /tmp/anaconda.log and /tmp/syslog to /var/log/anaconda.log and /var/log/anaconda.syslog respectively (#124370) - Fix Polish (#134554) diff --git a/bootdisk/i386/syslinux.cfg b/bootdisk/i386/syslinux.cfg old mode 100755 new mode 100644 diff --git a/bootdisk/x86_64/syslinux.cfg b/bootdisk/x86_64/syslinux.cfg old mode 100755 new mode 100644 diff --git a/filer.py b/filer.py index 2c3375b38..55cf95bb1 100644 --- a/filer.py +++ b/filer.py @@ -1,5 +1,3 @@ -#!/usr/bin/python -# # Copyright (C) 2008 Red Hat, Inc. # All rights reserved. # diff --git a/gui.py b/gui.py old mode 100755 new mode 100644 diff --git a/installclasses/Makefile b/installclasses/Makefile index 3b1c16884..2925eec28 100644 --- a/installclasses/Makefile +++ b/installclasses/Makefile @@ -30,7 +30,7 @@ all: install: mkdir -p $(DESTDIR)/$(PYTHONLIBDIR)/installclasses - install $(CLASSES) $(DESTDIR)/$(PYTHONLIBDIR)/installclasses + install -p -m 644 $(CLASSES) $(DESTDIR)/$(PYTHONLIBDIR)/installclasses ../py-compile --basedir $(DESTDIR)/$(PYTHONLIBDIR)/installclasses $(DESTDIR)/$(PYTHONLIBDIR)/installclasses/*.py clean: diff --git a/isys/Makefile b/isys/Makefile index 14c750587..57d9df53d 100644 --- a/isys/Makefile +++ b/isys/Makefile @@ -77,7 +77,7 @@ clean: install: all install -s $(PYMODULES) $(DESTDIR)/$(PYTHONLIBDIR) - install isys.py $(DESTDIR)/$(PYTHONLIBDIR) + install -p -m 644 isys.py $(DESTDIR)/$(PYTHONLIBDIR) subdirs: for d in $(SUBDIRS); do make -C $$d; done diff --git a/iw/Makefile b/iw/Makefile index 742b96945..728af7c49 100644 --- a/iw/Makefile +++ b/iw/Makefile @@ -24,7 +24,7 @@ all: install: mkdir -p $(DESTDIR)/$(PYTHONLIBDIR)/iw - install *.py $(DESTDIR)/$(PYTHONLIBDIR)/iw + install -p -m 644 *.py $(DESTDIR)/$(PYTHONLIBDIR)/iw ../py-compile --basedir $(DESTDIR)/$(PYTHONLIBDIR)/iw $(DESTDIR)/$(PYTHONLIBDIR)/iw/*.py clean: diff --git a/scripts/Makefile b/scripts/Makefile index 59a51c219..6e0e23bbe 100644 --- a/scripts/Makefile +++ b/scripts/Makefile @@ -22,15 +22,16 @@ include ../Makefile.inc all: install: - install -m 755 upd-instroot $(DESTDIR)/$(RUNTIMEDIR) - install -m 755 mk-images* $(DESTDIR)/$(RUNTIMEDIR) - install -m 755 buildinstall $(DESTDIR)/$(RUNTIMEDIR) - install -m 755 buildinstall.functions $(DESTDIR)/$(RUNTIMEDIR) - install -m 755 scrubtree $(DESTDIR)/$(RUNTIMEDIR) - install -m 755 getkeymaps $(DESTDIR)/$(RUNTIMEDIR) - install -m 755 makestamp.py $(DESTDIR)/$(RUNTIMEDIR) - install -m 755 maketreeinfo.py $(DESTDIR)/$(RUNTIMEDIR) - install -m 755 pyrc.py $(DESTDIR)/$(RUNTIMEDIR) - install -m 755 upd-updates $(DESTDIR)/$(RUNTIMEDIR) + install -p -m 755 upd-instroot $(DESTDIR)/$(RUNTIMEDIR) + install -p -m 755 mk-images $(DESTDIR)/$(RUNTIMEDIR) + install -p -m 644 mk-images.* $(DESTDIR)/$(RUNTIMEDIR) + install -p -m 755 buildinstall $(DESTDIR)/$(RUNTIMEDIR) + install -p -m 755 buildinstall.functions $(DESTDIR)/$(RUNTIMEDIR) + install -p -m 755 scrubtree $(DESTDIR)/$(RUNTIMEDIR) + install -p -m 755 getkeymaps $(DESTDIR)/$(RUNTIMEDIR) + install -p -m 755 makestamp.py $(DESTDIR)/$(RUNTIMEDIR) + install -p -m 755 maketreeinfo.py $(DESTDIR)/$(RUNTIMEDIR) + install -p -m 644 pyrc.py $(DESTDIR)/$(RUNTIMEDIR) + install -p -m 755 upd-updates $(DESTDIR)/$(RUNTIMEDIR) depend: diff --git a/scripts/mk-images.efi b/scripts/mk-images.efi old mode 100755 new mode 100644 index f39a051a1..e66987613 --- a/scripts/mk-images.efi +++ b/scripts/mk-images.efi @@ -1,4 +1,3 @@ -#!/bin/bash # # mk-images.efi # diff --git a/scripts/mk-images.ia64 b/scripts/mk-images.ia64 index 871ce6a61..d4dae3572 100644 --- a/scripts/mk-images.ia64 +++ b/scripts/mk-images.ia64 @@ -1,4 +1,3 @@ -#!/bin/bash # # mk-images.ia64 # diff --git a/scripts/pyrc.py b/scripts/pyrc.py old mode 100755 new mode 100644 diff --git a/sortedtransaction.py b/sortedtransaction.py index 986ecd871..e5b2f0276 100644 --- a/sortedtransaction.py +++ b/sortedtransaction.py @@ -1,4 +1,3 @@ -#!/usr/bin/python # # sortedtransaction.py # diff --git a/textw/Makefile b/textw/Makefile index 2590f6463..958bb142f 100644 --- a/textw/Makefile +++ b/textw/Makefile @@ -24,7 +24,7 @@ all: install: mkdir -p $(DESTDIR)/$(PYTHONLIBDIR)/textw - install *.py $(DESTDIR)/$(PYTHONLIBDIR)/textw + install -p -m 644 *.py $(DESTDIR)/$(PYTHONLIBDIR)/textw ../py-compile --basedir $(DESTDIR)/$(PYTHONLIBDIR)/textw $(DESTDIR)/$(PYTHONLIBDIR)/textw/*.py clean: diff --git a/ui/Makefile b/ui/Makefile index 021a12c1a..e01e99033 100644 --- a/ui/Makefile +++ b/ui/Makefile @@ -24,7 +24,7 @@ all: install: mkdir -p $(DESTDIR)/$(ANACONDADATADIR)/ui - install *.glade $(DESTDIR)/$(ANACONDADATADIR)/ui + install -p -m 644 *.glade $(DESTDIR)/$(ANACONDADATADIR)/ui depend: -- cgit