Rename the subpackage kdump-anaconda-addon to kexec-tool-anaconda-addon to keep consistency
Signed-off-by: Arthur Zou zzou@redhat.com --- kdump-anaconda-addon/Makefile | 14 +++++++------- kexec-tools.spec | 12 +++++------- 2 files changed, 12 insertions(+), 14 deletions(-)
diff --git a/kdump-anaconda-addon/Makefile b/kdump-anaconda-addon/Makefile index affd8f5..7f8747d 100644 --- a/kdump-anaconda-addon/Makefile +++ b/kdump-anaconda-addon/Makefile @@ -34,28 +34,28 @@ uninstall: rm -rfv $(DESTDIR)$(ADDONDIR)
dist: - rm -rf $(DISTNAME) - mkdir -p $(DISTNAME) + rm -rf $(NAME) + mkdir -p $(NAME) @if test -d ".git"; \ then \ echo Creating ChangeLog && \ ( cd "$(top_srcdir)" && \ echo '# Generate automatically. Do not edit.'; echo; \ git log --stat --date=short ) > ChangeLog.tmp \ - && mv -f ChangeLog.tmp $(DISTNAME)/ChangeLog \ + && mv -f ChangeLog.tmp $(NAME)/ChangeLog \ || ( rm -f ChangeLog.tmp ; \ echo Failed to generate ChangeLog >&2 ); \ else \ echo A git clone is required to generate a ChangeLog >&2; \ fi for file in $(FILES); do \ - cp -rpv $$file $(DISTNAME)/$$file; \ + cp -rpv $$file $(NAME)/$$file; \ done for excl in $(EXCLUDES); do \ - find $(DISTNAME) -name "$$excl" -delete; \ + find $(NAME) -name "$$excl" -delete; \ done - tar -czvf ../$(DISTBALL) $(DISTNAME) - rm -rf $(DISTNAME) + tar -czvf ../$(DISTBALL) $(NAME) + rm -rf $(NAME)
potfile: $(MAKE) DESTDIR=$(DESTDIR) -C po potfile diff --git a/kexec-tools.spec b/kexec-tools.spec index f810271..afe5aa9 100644 --- a/kexec-tools.spec +++ b/kexec-tools.spec @@ -97,12 +97,10 @@ The eppic_makedumpfile.so shared object is loaded by the or confidential kernel data from a dumpfile. %endif
-%package -n kdump-anaconda-addon -Version: 0.1 -Release: 1%{?dist} +%package anaconda-addon Summary: Kdump configration anaconda addon Requires: anaconda >= 21.33 -%description -n kdump-anaconda-addon +%description anaconda-addon Kdump anaconda addon
%prep @@ -143,7 +141,7 @@ make -C eppic/libeppic make -C makedumpfile-1.5.6 LINKTYPE=dynamic USELZO=on USESNAPPY=on %endif make -C kexec-tools-po -make -C kdump-anaconda-addon-0.1/po +make -C kdump-anaconda-addon/po
%install make install DESTDIR=$RPM_BUILD_ROOT @@ -191,7 +189,7 @@ install -m 755 makedumpfile-1.5.6/eppic_makedumpfile.so $RPM_BUILD_ROOT/%{_libdi %endif make -C kexec-tools-po install DESTDIR=$RPM_BUILD_ROOT %find_lang %{name} -make -C kdump-anaconda-addon-0.1 install DESTDIR=$RPM_BUILD_ROOT +make -C kdump-anaconda-addon install DESTDIR=$RPM_BUILD_ROOT %find_lang kdump-anaconda-addon
%define remove_dracut_prefix() %(echo -n %1|sed 's/.*dracut-//g') @@ -325,7 +323,7 @@ done %{_libdir}/eppic_makedumpfile.so %endif
-%files -n kdump-anaconda-addon -f kdump-anaconda-addon.lang +%files anaconda-addon -f kdump-anaconda-addon.lang %{_datadir}/anaconda/addons/com_redhat_kdump %doc
Hi, Arthur
On 05/22/14 at 03:34pm, Arthur Zou wrote:
Rename the subpackage kdump-anaconda-addon to kexec-tool-anaconda-addon to keep consistency
The patch description did not explain why do we need to rename it
Because it is a subpackage so every time fedpkg builds a new release the package version number should increase. But kdump-annaconda-addon just keep same version, so let's rename it to kexec-tools-annaconda-addon here kexec-tools- is a default prefix. For version let's use default top level version.
Signed-off-by: Arthur Zou zzou@redhat.com
kdump-anaconda-addon/Makefile | 14 +++++++------- kexec-tools.spec | 12 +++++------- 2 files changed, 12 insertions(+), 14 deletions(-)
diff --git a/kdump-anaconda-addon/Makefile b/kdump-anaconda-addon/Makefile index affd8f5..7f8747d 100644 --- a/kdump-anaconda-addon/Makefile +++ b/kdump-anaconda-addon/Makefile @@ -34,28 +34,28 @@ uninstall: rm -rfv $(DESTDIR)$(ADDONDIR)
dist:
- rm -rf $(DISTNAME)
- mkdir -p $(DISTNAME)
- rm -rf $(NAME)
- mkdir -p $(NAME) @if test -d ".git"; \ then \ echo Creating ChangeLog && \ ( cd "$(top_srcdir)" && \ echo '# Generate automatically. Do not edit.'; echo; \ git log --stat --date=short ) > ChangeLog.tmp \
&& mv -f ChangeLog.tmp $(DISTNAME)/ChangeLog \
|| ( rm -f ChangeLog.tmp ; \ echo Failed to generate ChangeLog >&2 ); \ else \ echo A git clone is required to generate a ChangeLog >&2; \ fi for file in $(FILES); do \&& mv -f ChangeLog.tmp $(NAME)/ChangeLog \
cp -rpv $$file $(DISTNAME)/$$file; \
done for excl in $(EXCLUDES); do \cp -rpv $$file $(NAME)/$$file; \
find $(DISTNAME) -name "$$excl" -delete; \
donefind $(NAME) -name "$$excl" -delete; \
- tar -czvf ../$(DISTBALL) $(DISTNAME)
- rm -rf $(DISTNAME)
- tar -czvf ../$(DISTBALL) $(NAME)
- rm -rf $(NAME)
potfile: $(MAKE) DESTDIR=$(DESTDIR) -C po potfile diff --git a/kexec-tools.spec b/kexec-tools.spec index f810271..afe5aa9 100644 --- a/kexec-tools.spec +++ b/kexec-tools.spec @@ -97,12 +97,10 @@ The eppic_makedumpfile.so shared object is loaded by the or confidential kernel data from a dumpfile. %endif
-%package -n kdump-anaconda-addon -Version: 0.1 -Release: 1%{?dist} +%package anaconda-addon Summary: Kdump configration anaconda addon Requires: anaconda >= 21.33 -%description -n kdump-anaconda-addon +%description anaconda-addon Kdump anaconda addon
%prep @@ -143,7 +141,7 @@ make -C eppic/libeppic make -C makedumpfile-1.5.6 LINKTYPE=dynamic USELZO=on USESNAPPY=on %endif make -C kexec-tools-po -make -C kdump-anaconda-addon-0.1/po +make -C kdump-anaconda-addon/po
%install make install DESTDIR=$RPM_BUILD_ROOT @@ -191,7 +189,7 @@ install -m 755 makedumpfile-1.5.6/eppic_makedumpfile.so $RPM_BUILD_ROOT/%{_libdi %endif make -C kexec-tools-po install DESTDIR=$RPM_BUILD_ROOT %find_lang %{name} -make -C kdump-anaconda-addon-0.1 install DESTDIR=$RPM_BUILD_ROOT +make -C kdump-anaconda-addon install DESTDIR=$RPM_BUILD_ROOT %find_lang kdump-anaconda-addon
%define remove_dracut_prefix() %(echo -n %1|sed 's/.*dracut-//g') @@ -325,7 +323,7 @@ done %{_libdir}/eppic_makedumpfile.so %endif
-%files -n kdump-anaconda-addon -f kdump-anaconda-addon.lang +%files anaconda-addon -f kdump-anaconda-addon.lang %{_datadir}/anaconda/addons/com_redhat_kdump %doc
-- 1.8.4.2