diff options
| author | Andras Timar <andras.timar@collabora.com> | 2021-05-03 16:04:19 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2022-02-13 09:38:59 +0100 |
| commit | df4fb11e2dd9f678a9dd07e60bc908bccf873111 (patch) | |
| tree | a2a388e09b5976552e35a75f68121e0ee2e295d7 /sysui | |
| parent | 25bc436fe72e38246ec86cdc0a2a361e99e3b33f (diff) | |
[cp] do not include version number to package name
Change-Id: I2f5d9eb0e43c80d5712e0a65167ad8d0e56ab330
Diffstat (limited to 'sysui')
| -rw-r--r-- | sysui/CustomTarget_deb.mk | 10 | ||||
| -rw-r--r-- | sysui/CustomTarget_rpm.mk | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/sysui/CustomTarget_deb.mk b/sysui/CustomTarget_deb.mk index 44afba7233ee..a0d3f02aa74b 100644 --- a/sysui/CustomTarget_deb.mk +++ b/sysui/CustomTarget_deb.mk @@ -21,10 +21,10 @@ $(foreach product,$(PRODUCTLIST),\ $(product)/DEBIAN/postinst \ $(product)/DEBIAN/postrm \ $(product)/DEBIAN/prerm \ - $(product)$(PKGVERSIONSHORT)-debian-menus_$(PKGVERSION)-$(LIBO_VERSION_PATCH)_all.deb) \ + $(product)-freedesktop-menus_$(PKGVERSION)-$(LIBO_VERSION_PATCH)_all.deb) \ )) -$(deb_WORKDIR)/%-desktop-integration.tar.gz: $(deb_WORKDIR)/%$(PKGVERSIONSHORT)-debian-menus_$(PKGVERSION)-$(LIBO_VERSION_PATCH)_all.deb +$(deb_WORKDIR)/%-desktop-integration.tar.gz: $(deb_WORKDIR)/%-freedesktop-menus_$(PKGVERSION)-$(LIBO_VERSION_PATCH)_all.deb fakeroot $(GNUTAR) -C $(deb_WORKDIR) -cf - $(notdir $<) | gzip > $@ $(deb_WORKDIR)/%/DEBIAN/postrm: $(deb_SRCDIR)/postrm @@ -51,15 +51,15 @@ $(deb_WORKDIR)/%/DEBIAN/control: $(deb_SRCDIR)/control $(call gb_CustomTarget_ge -e 's/%PRODUCTNAME/$(PRODUCTNAME.$*) $(PRODUCTVERSION)/' \ -e 's/%PREFIX/$(UNIXFILENAME.$*)/' \ -e 's/%ICONPREFIX/$(UNIXFILENAME.$*)/' \ - > $(deb_WORKDIR)/$*/usr/lib/menu/$*$(PKGVERSIONSHORT) - echo "Package: $*$(PKGVERSIONSHORT)-debian-menus" >$@ + > $(deb_WORKDIR)/$*/usr/lib/menu/$* + echo "Package: $*-freedesktop-menus" >$@ cat $< | tr -d "\015" | \ sed 's/%productname/$(PRODUCTNAME.$*) $(PRODUCTVERSION)/' \ >> $@ echo "Version: $(PKGVERSION)-$(LIBO_VERSION_PATCH)" >>$@ du -k -s $(deb_WORKDIR)/$* | $(gb_AWK) -F ' ' '{ printf "Installed-Size: %s\n", $$1 ; }' >>$@ -$(deb_WORKDIR)/%$(PKGVERSIONSHORT)-debian-menus_$(PKGVERSION)-$(LIBO_VERSION_PATCH)_all.deb: $(deb_WORKDIR)/%/DEBIAN/postrm $(deb_WORKDIR)/%/DEBIAN/postinst $(deb_WORKDIR)/%/DEBIAN/prerm $(deb_WORKDIR)/%/DEBIAN/control +$(deb_WORKDIR)/%-freedesktop-menus_$(PKGVERSION)-$(LIBO_VERSION_PATCH)_all.deb: $(deb_WORKDIR)/%/DEBIAN/postrm $(deb_WORKDIR)/%/DEBIAN/postinst $(deb_WORKDIR)/%/DEBIAN/prerm $(deb_WORKDIR)/%/DEBIAN/control chmod -R g-w $(deb_WORKDIR)/$* chmod a+rx $(deb_WORKDIR)/$*/DEBIAN \ diff --git a/sysui/CustomTarget_rpm.mk b/sysui/CustomTarget_rpm.mk index a76b4161e2af..cb8ed05fe10f 100644 --- a/sysui/CustomTarget_rpm.mk +++ b/sysui/CustomTarget_rpm.mk @@ -15,10 +15,10 @@ rpm_SRCDIR := $(SRCDIR)/sysui/desktop RPMDISTROS := freedesktop define rpm_register_target -$(call gb_CustomTarget_get_target,sysui/rpm): $(rpm_WORKDIR)/$(1)/$(1)$(PKGVERSIONSHORT)-$(2)-menus-$(PKGVERSION)-$(LIBO_VERSION_PATCH).noarch.rpm +$(call gb_CustomTarget_get_target,sysui/rpm): $(rpm_WORKDIR)/$(1)/$(1)-$(2)-menus-$(PKGVERSION)-$(LIBO_VERSION_PATCH).noarch.rpm -$(rpm_WORKDIR)/$(1)-desktop-integration.tar.gz: $(rpm_WORKDIR)/$(1)/$(1)$(PKGVERSIONSHORT)-$(2)-menus-$(PKGVERSION)-$(LIBO_VERSION_PATCH).noarch.rpm -$(rpm_WORKDIR)/$(1)/$(1)$(PKGVERSIONSHORT)-$(2)-menus-$(PKGVERSION)-$(LIBO_VERSION_PATCH).noarch.rpm : \ +$(rpm_WORKDIR)/$(1)-desktop-integration.tar.gz: $(rpm_WORKDIR)/$(1)/$(1)-$(2)-menus-$(PKGVERSION)-$(LIBO_VERSION_PATCH).noarch.rpm +$(rpm_WORKDIR)/$(1)/$(1)-$(2)-menus-$(PKGVERSION)-$(LIBO_VERSION_PATCH).noarch.rpm : \ $(rpm_SRCDIR)/$(2)/$(2)-menus.spec \ $(call gb_CustomTarget_get_workdir,sysui/share)/$(1)/create_tree.sh \ | $(rpm_WORKDIR)/$(1)/.dir @@ -29,7 +29,7 @@ $(rpm_WORKDIR)/$(1)/$(1)$(PKGVERSIONSHORT)-$(2)-menus-$(PKGVERSION)-$(LIBO_VERSI --define "_rpmdir $(rpm_WORKDIR)/$(1)" \ --define "_rpmfilename %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm" \ --define "productname $(PRODUCTNAME.$(1))" \ - --define "pkgprefix $(1)$(PKGVERSIONSHORT)" \ + --define "pkgprefix $(1)" \ --define "unixfilename $(UNIXFILENAME.$(1))" \ --define "productversion $(PRODUCTVERSION)" \ --define "iconprefix $(UNIXFILENAME.$(1))" \ @@ -54,6 +54,6 @@ $(foreach product,$(PRODUCTLIST),\ )) $(rpm_WORKDIR)/%-desktop-integration.tar.gz: - fakeroot $(GNUTAR) -C $(rpm_WORKDIR)/$* -cf - $(foreach distro,$(RPMDISTROS),$*$(PKGVERSIONSHORT)-$(distro)-menus-$(PKGVERSION)-$(LIBO_VERSION_PATCH).noarch.rpm) | gzip > $@ + fakeroot $(GNUTAR) -C $(rpm_WORKDIR)/$* -cf - $(foreach distro,$(RPMDISTROS),$*-$(distro)-menus-$(PKGVERSION)-$(LIBO_VERSION_PATCH).noarch.rpm) | gzip > $@ # vim: set noet sw=4 ts=4: |