Changes - SailfishOS Open Build Service

Changes of Revision 4

[-] [+]	Changed	_service:tar_git:alpine.spec
@@ -6,13 +6,20 @@ Name: alpine # >> macros +# 4.2 is 40200 +# 4.3 is 40300 +%if %{sailfishos_version} >= 40400 +# SFOS 4.4 ships libxcrypt instead of glibc libcrypt +BuildRequires: pkgconfig(libcrypt) +%endif # << macros + %define alpinedir .local/share/%{name} %define smimedir .local/share/%{name}/smime %define cachedir .cache/%{name} Summary: Text-based mail and news client. Includes patches by Eduardo Chappa -Version: 2.25.1+obs3 +Version: 2.25.1+obs4 Release: 1 Group: Applications License: ASL 2.0 @@ -22,6 +29,7 @@ Source2: pine.conf Source3: pine.conf.fixed Source100: alpine.yaml +Source101: alpine-rpmlintrc Patch0: %SOURCE1 BuildRequires: pkgconfig(ncurses) BuildRequires: pkgconfig(tinfo) @@ -49,6 +57,8 @@ - Office - Email - News +Screenshots: + - https://github.com/nephros/sailfish-alpine/raw/master/Screenshot_Alpine_001.png Custom: PackagingRepo: https://github.com/nephros/sailfish-alpine.git Url: @@ -68,6 +78,8 @@ %if "%{?vendor}" == "chum" DeveloperName: Eduardo Chappa PackagerName: nephros +Custom: + PackagingRepo: https://github.com/nephros/sailfish-alpine.git Categories: - Documentation %endif @@ -90,7 +102,11 @@ Type: console-application Categories: - Office - - TextTools + - TextEditor +Custom: + PackagingRepo: https://github.com/nephros/sailfish-alpine.git +Screenshots: + - https://github.com/nephros/sailfish-alpine/raw/master/Screenshot_Pico_001.png Url: Help: https://en.wikipedia.org/wiki/Pico_(text_editor) %endif @@ -113,6 +129,10 @@ Categories: - Office - FileManager +Screenshots: + - https://github.com/nephros/sailfish-alpine/raw/master/Screenshot_Pilot_001.png +Custom: + PackagingRepo: https://github.com/nephros/sailfish-alpine.git %endif @@ -123,7 +143,8 @@ %description tools %{summary}. -These are additional tools for the Alpine email program. +These are additional tools for the Alpine email program: +rpdump, rpload, mailutil, and dmail %if "%{?vendor}" == "chum" PackageName: Alpine tools @@ -133,15 +154,31 @@ Categories: - Email - Utility +Custom: + PackagingRepo: https://github.com/nephros/sailfish-alpine.git %endif +# >> macros2 +# 4.2 is 40200 +# 4.3 is 40300 +%if %{sailfishos_version} >= 40400 +# SFOS 4.4 ships libxcrypt instead of glibc libcrypt +printf "INFO: using libxcrypt implementation of libcrypt\n" +BuildRequires: pkgconfig(libcrypt) +%else +printf "INFO: using glibc implementation of libcrypt\n" +%endif +# << macros2 +%define foo bar + %prep %setup -q -n %{name}-%{version}/upstream # %SOURCE1 %patch0 -p1 # >> setup +printf "INFO: SFOS VERSION is: %s\n" %{sailfishos_version} # << setup %build
[-] [+]	Changed	_service ^
@@ -2,7 +2,7 @@ <service name="tar_git"> <param name="url">https://github.com/nephros/sailfish-alpine.git</param> <param name="branch"/> - <param name="revision">2.25.1+obs3</param> + <param name="revision">2.25.1+obs4</param> <param name="debian">N</param> <param name="dumb">N</param> </service>
	Added	_service:tar_git:alpine-2.25.1+obs4.tar.xz/Screenshot_Alpine_001.png ^
	Added	_service:tar_git:alpine-2.25.1+obs4.tar.xz/Screenshot_Pico_001.png ^
	Added	_service:tar_git:alpine-2.25.1+obs4.tar.xz/Screenshot_Pilot_001.png ^
[-] [+]	Added	_service:tar_git:alpine-rpmlintrc ^
@@ -0,0 +1,4 @@ +from Config import * +addFilter("description-line-too-long") +addFilter("invalid-url") +addFilter("ncoherent-version-in-changelog")
[-] [+]	Changed	_service:tar_git:alpine.yaml ^
@@ -31,6 +31,8 @@ - Office - Email - News + Screenshots: + - https://github.com/nephros/sailfish-alpine/raw/master/Screenshot_Alpine_001.png Custom: PackagingRepo: https://github.com/nephros/sailfish-alpine.git Url: @@ -48,10 +50,17 @@ - aspell SetupOptions: '-q -n %{name}-%{version}/upstream' #NoSetup: true +Macros2: + # needed so custom macros2 is possible + - 'foo;bar' Macros: - 'alpinedir;.local/share/%{name}' - 'smimedir;.local/share/%{name}/smime' - 'cachedir;.cache/%{name}' +RpmLintIgnore: + - 'description-line-too-long' + - 'invalid-url' + - 'ncoherent-version-in-changelog' ConfigOptions: - '--with-ssl' - '--with-ipv6' @@ -94,6 +103,8 @@ %if "%{?vendor}" == "chum" DeveloperName: Eduardo Chappa PackagerName: nephros + Custom: + PackagingRepo: https://github.com/nephros/sailfish-alpine.git Categories: - Documentation %endif @@ -124,7 +135,11 @@ Type: console-application Categories: - Office - - TextTools + - TextEditor + Custom: + PackagingRepo: https://github.com/nephros/sailfish-alpine.git + Screenshots: + - https://github.com/nephros/sailfish-alpine/raw/master/Screenshot_Pico_001.png Url: Help: https://en.wikipedia.org/wiki/Pico_(text_editor) %endif @@ -149,6 +164,10 @@ Categories: - Office - FileManager + Screenshots: + - https://github.com/nephros/sailfish-alpine/raw/master/Screenshot_Pilot_001.png + Custom: + PackagingRepo: https://github.com/nephros/sailfish-alpine.git %endif Group: Applications AutoDepend: false @@ -160,7 +179,8 @@ Description: \| %{summary}. - These are additional tools for the Alpine email program. + These are additional tools for the Alpine email program: + rpdump, rpload, mailutil, and dmail %if "%{?vendor}" == "chum" PackageName: Alpine tools @@ -170,6 +190,8 @@ Categories: - Email - Utility + Custom: + PackagingRepo: https://github.com/nephros/sailfish-alpine.git %endif Group: Applications AutoDepend: false