Changeset 1202 for spec/trunk/SPECS

Timestamp:

Jun 29, 2017, 4:58:43 PM (8 years ago)

Author:

Silvan Scherrer

Message:

spec: bww-resources-rpm: Release version 1.0.2-1.

Location:

spec/trunk/SPECS

Files:

• bww-resources-rpm.spec (modified) (2 diffs)
• bww-resources-rpm/macros.bww (modified) (2 diffs)

spec/trunk/SPECS/bww-resources-rpm.spec

@@ -4 +4 @@
 Summary:    bitwiseworks icons and folders
 Name:       bww-resources-rpm
-Version:    1.0.1
+Version:    1.0.2
 Release:    1%{?dist}
 License:    Proprietory
@@ -85 +85 @@
 
 %changelog
+* Thu Jun 29 2017 Silvan Scherrer <silvan.scherrer@aroa.ch> 1.0.2-1
+- added -nv parameter to the macro
+- fixed a possible wps id issue in the readme part of the macro
+
 * Thu Jun 08 2017 Silvan Scherrer <silvan.scherrer@aroa.ch> 1.0.1-1
 - redesigned the macro completely

spec/trunk/SPECS/bww-resources-rpm/macros.bww

@@ -51 +51 @@
 # If this parameter is not provided, then no shadow is created
 #
+# parameter (-nv) (used in bww_folder)
+# Don't add the version to the folder name
+# If this parameter is not provided, then the version is added
+#
 
-%bww_folder(t:d:s:)\
+%bww_folder(t:d:s:nv:)\
 %if %{undefined __bww_folder_done}\
-%define __bww_title %{!-t:%{summary} %{version}}%{-t:%{-t*}}\
+%define __bww_titleov %{!-t:%{summary}}%{-t:%{-t*}}\
+%define __bww_title %{!-nv:%{__bww_titleov} %{version}}%{-nv:%{__bww_titleov}}\
 %define __bww_docdir %{!-d:%_defaultdocdir/%{name}-%{version}}%{-d:%{-d*}}\
 %wps_object_create WP_BWWHELP:WPFolder|bww Help|<WP_ASSISTANCE>|TITLE=bitwiseworks Help Center;SHOWALLINTREEVIEW=YES;ICONRESOURCE=60,PMWP.DLL;ICONNRESOURCE=83,PMWP.DLL;BACKGROUND=((/@unixroot/usr/share/os2/bww/bwwfbkg.bmp));\
@@ -76 +81 @@
 %bww_readme(r:d:)\
 %define __bww_docdir %{!-d:%_defaultdocdir/%{name}-%{version}}%{-d:%{-d*}}\
-%{-r:%{expand:%wps_object_create %{-r*}_README:WPShadow|Readme|<%{name}_FOLDER>|SHADOWID=((%{__bww_docdir}/%{-r*}))}}\
+%{-r:%{expand:%wps_object_create %{name}_README:WPShadow|Readme|<%{name}_FOLDER>|SHADOWID=((%{__bww_docdir}/%{-r*}))}}\
 %{nil}