openmamba/desktop-base-openmamba
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

flashplugin: fix filename and Makefile multiarch support

Browse Source
This commit is contained in:
Silvan Calarco 2013-02-04 19:06:31 +01:00
parent 6f9a1a9820
commit b5aa9a1b0a
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -97,11 +97,11 @@ pck_catalogs2 := $(wildcard bootrecover/po/*.po)
.SUFFIXES: .in .po .mo .SUFFIXES: .in .po .mo
.in:; @echo "generating $@..."; \ .in:; @echo "generating $@..."; \
[ "$(ARCH)" != "x86_64" ] && ARCH=i386; \ if [ "$(ARCH)" != "x86_64" ]; then ARCH=i386; else ARCH=$(ARCH); fi; \
sed "s,@distroID@,$(DISTROID),g;\ sed "s,@distroID@,$(DISTROID),g;\
s,@distroid@,$(DISTROid),g;\ s,@distroid@,$(DISTROid),g;\
s,@distroicon@,$(DISTROICON),g;\ s,@distroicon@,$(DISTROICON),g;\
s,@arch@,$(ARCH),g;\ s,@arch@,$$ARCH,g;\
s,@distribution@,$(RPM_DISTRIBUTION),g;\ s,@distribution@,$(RPM_DISTRIBUTION),g;\
s,@distroext@,$(RPM_DISTROEXT),g;\ s,@distroext@,$(RPM_DISTROEXT),g;\
s,@vendor@,$(RPM_VENDOR),g;\ s,@vendor@,$(RPM_VENDOR),g;\

2
SRPMS/flashplugin/distroutils.sysconfig.in
View File

@ -1,7 +1,7 @@
## Adobe Flash Plugin ## Adobe Flash Plugin
# package name (do not modify unless you know what you're doing) # package name (do not modify unless you know what you're doing)
FLASH_PLUGIN_PCK=install_flash_player_11_linux_@arch@.tar.gz FLASH_PLUGIN_PCK=install_flash_player_11_linux.@arch@.tar.gz
# package URL (do not modify unless you know what you're doing) # package URL (do not modify unless you know what you're doing)
FLASH_PLUGIN_URL=http://fpdownload.macromedia.com/get/flashplayer/pdc/${FLASHPLUGIN_VERSION}/ FLASH_PLUGIN_URL=http://fpdownload.macromedia.com/get/flashplayer/pdc/${FLASHPLUGIN_VERSION}/