diff --git a/SOURCES/0001-Disable-running-gyp-on-shared-deps.patch b/SOURCES/0001-Disable-running-gyp-on-shared-deps.patch index 79cbc7e..3c11dd8 100644 --- a/SOURCES/0001-Disable-running-gyp-on-shared-deps.patch +++ b/SOURCES/0001-Disable-running-gyp-on-shared-deps.patch @@ -1,19 +1,17 @@ -From def28d29f907050d8bcd94ed2e341d128ffa3fa6 Mon Sep 17 00:00:00 2001 +From 7a6257be1d0276ff22d2d92ea89c5bca6c633802 Mon Sep 17 00:00:00 2001 From: Zuzana Svetlikova Date: Thu, 27 Apr 2017 14:25:42 +0200 -Subject: [PATCH 1/2] Disable running gyp on shared deps +Subject: [PATCH 1/3] Disable running gyp on shared deps --- Makefile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile -index 5fc2bb0c58f5532044a14e9f9595b2316f562726..f1c1545caa220d7442d6d92c49412ec7554de123 100644 +index 316410e3f81e39cdddecf91d5b717c884a9c51b3..62c8ebb5b95a68e44d4c2ab3beee70d63c3175c7 100644 --- a/Makefile +++ b/Makefile -@@ -121,14 +121,13 @@ with-code-cache: - - .PHONY: test-code-cache +@@ -123,10 +123,9 @@ with-code-cache: test-code-cache: with-code-cache $(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=$(BUILDTYPE_LOWER) code-cache @@ -27,8 +25,6 @@ index 5fc2bb0c58f5532044a14e9f9595b2316f562726..f1c1545caa220d7442d6d92c49412ec7 $(PYTHON) tools/gyp_node.py -f make config.gypi: configure configure.py - @if [ -x config.status ]; then \ - ./config.status; \ -- -2.19.0 +2.24.1 diff --git a/SPECS/mattermost-plugin-custom-attributes.spec b/SPECS/mattermost-plugin-custom-attributes.spec new file mode 100644 index 0000000..0eefc1a --- /dev/null +++ b/SPECS/mattermost-plugin-custom-attributes.spec @@ -0,0 +1,57 @@ +%define mattermost_user mattermost +%define mattermost_group mattermost +%define mattermost_home /var/lib/mattermost +%define debug_package %{nil} + +Name: mattermost-plugin-custom-attributes +Version: 1.2.0 +Release: 1%{?dist} +Summary: Plugin for Mattermost to have Custom Attributes +URL: https://github.com/mattermost/mattermost-plugin-custom-attributes +License: Apache +BuildRequires: golang +Requires: mattermost + + +%description + + +%prep +%setup -q -T -c %{name}-%{version} +export GOPATH=`pwd` +mkdir -p src/github.com/mattermost/ +cd src/github.com/mattermost/ +git clone https://github.com/mattermost/mattermost-plugin-custom-attributes + + +%build +export GOPATH=`pwd` +export PATH="bin:"$PATH +export GO111MODULE=on +cd src/github.com/mattermost/mattermost-plugin-custom-attributes +pushd webapp +npm install +npm run build +popd +git checkout tags/v%{version} +go build -o plugin.exe ./server + + +%install +mkdir -p %{buildroot}%{mattermost_home}/plugins/custom-attributes/{webapp,server}/ +cp -rv src/github.com/mattermost/mattermost-plugin-custom-attributes/plugin.json %{buildroot}%{mattermost_home}/plugins/custom-attributes/ +sed 's/"executables": {/"executables": { "server\/plugin.exe"/' -i %{buildroot}%{mattermost_home}/plugins/custom-attributes/plugin.json +sed '/"darwin-amd64"/d' -i %{buildroot}%{mattermost_home}/plugins/custom-attributes/plugin.json +sed '/"linux-amd64"/d' -i %{buildroot}%{mattermost_home}/plugins/custom-attributes/plugin.json +sed '/"windows-amd64"/d' -i %{buildroot}%{mattermost_home}/plugins/custom-attributes/plugin.json +cp -rv src/github.com/mattermost/mattermost-plugin-custom-attributes/plugin.exe %{buildroot}%{mattermost_home}/plugins/custom-attributes/server/ +cp -rv src/github.com/mattermost/mattermost-plugin-custom-attributes/webapp/dist/main.js %{buildroot}%{mattermost_home}/plugins/custom-attributes/webapp/ + + +%files +%{mattermost_home}/plugins/custom-attributes/plugin.json +%{mattermost_home}/plugins/custom-attributes/server/plugin.exe +%{mattermost_home}/plugins/custom-attributes/webapp/main.js + + +%changelog diff --git a/SPECS/mattermost-plugin-github.spec b/SPECS/mattermost-plugin-github.spec index b893774..ea50730 100644 --- a/SPECS/mattermost-plugin-github.spec +++ b/SPECS/mattermost-plugin-github.spec @@ -4,7 +4,7 @@ %define debug_package %{nil} Name: mattermost-plugin-github -Version: 0.11.0 +Version: 1.0.0 Release: 1%{?dist} URL: https://github.com/mattermost/mattermost-plugin-github Summary: Plugin for Mattermost and Github @@ -55,6 +55,7 @@ cp -rv src/github.com/mattermost/mattermost-plugin-github/assets %{buildroot}%{m %files %{mattermost_home}/plugins/github/assets/profile.png +%{mattermost_home}/plugins/github/assets/icon.svg %{mattermost_home}/plugins/github/plugin.json %{mattermost_home}/plugins/github/server/dist/plugin.exe %{mattermost_home}/plugins/github/webapp/dist/main.js diff --git a/SPECS/mattermost-plugin-jitsi.spec b/SPECS/mattermost-plugin-jitsi.spec index 26e6b60..600f4af 100644 --- a/SPECS/mattermost-plugin-jitsi.spec +++ b/SPECS/mattermost-plugin-jitsi.spec @@ -4,9 +4,9 @@ %define debug_package %{nil} Name: mattermost-plugin-jitsi -Version: 1.2.0 +Version: 1.3.0 Release: 1%{?dist} -URL: https://github.com/seansackowitz/mattermost-plugin-jitsi +URL: https://github.com/mattermost/mattermost-plugin-jitsi Summary: Plugin for Mattermost and Jitsi License: Apache BuildRequires: golang @@ -19,41 +19,33 @@ Requires: mattermost %prep %setup -q -T -c %{name}-%{version} export GOPATH=`pwd` -mkdir -p src/github.com/seansackowitz/ -cd src/github.com/seansackowitz/ -git clone https://github.com/seansackowitz/mattermost-plugin-jitsi +mkdir -p src/github.com/mattermost/ +cd src/github.com/mattermost/ +git clone https://github.com/mattermost/mattermost-plugin-jitsi %build export GOPATH=`pwd` export PATH="bin:"$PATH export GO111MODULE=on -cd src/github.com/seansackowitz/mattermost-plugin-jitsi +cd src/github.com/mattermost/mattermost-plugin-jitsi git checkout tags/v%{version} pushd webapp -npm install +ppm install npm run build popd -pushd server -go get github.com/Masterminds/glide -$GOPATH/bin/glide install -pushd vendor/github.com/mattermost/ -rm -rf mattermost-server -git clone https://github.com/mattermost/mattermost-server -popd -popd go build -o plugin.exe ./server %install mkdir -p %{buildroot}%{mattermost_home}/plugins/jitsi/{server,webapp} -cp -rv src/github.com/seansackowitz/mattermost-plugin-jitsi/plugin.json %{buildroot}%{mattermost_home}/plugins/jitsi/ +cp -rv src/github.com/mattermost/mattermost-plugin-jitsi/plugin.json %{buildroot}%{mattermost_home}/plugins/jitsi/ sed 's/"executables": {/"executables": { "server\/plugin.exe"/' -i %{buildroot}%{mattermost_home}/plugins/jitsi/plugin.json sed '/"darwin-amd64"/d' -i %{buildroot}%{mattermost_home}/plugins/jitsi/plugin.json sed '/"linux-amd64"/d' -i %{buildroot}%{mattermost_home}/plugins/jitsi/plugin.json sed '/"windows-amd64"/d' -i %{buildroot}%{mattermost_home}/plugins/jitsi/plugin.json -cp -rv src/github.com/seansackowitz/mattermost-plugin-jitsi/plugin.exe %{buildroot}%{mattermost_home}/plugins/jitsi/server/ -cp -rv src/github.com/seansackowitz/mattermost-plugin-jitsi/webapp/dist/main.js %{buildroot}%{mattermost_home}/plugins/jitsi/webapp/ +cp -rv src/github.com/mattermost/mattermost-plugin-jitsi/plugin.exe %{buildroot}%{mattermost_home}/plugins/jitsi/server/ +cp -rv src/github.com/mattermost/mattermost-plugin-jitsi/webapp/dist/main.js %{buildroot}%{mattermost_home}/plugins/jitsi/webapp/ %files diff --git a/SPECS/mattermost-plugin-memes.spec b/SPECS/mattermost-plugin-memes.spec index 37c7ef8..edbfd43 100644 --- a/SPECS/mattermost-plugin-memes.spec +++ b/SPECS/mattermost-plugin-memes.spec @@ -4,9 +4,10 @@ %define debug_package %{nil} Name: mattermost-plugin-memes -Version: 1.0.0 +Version: 1.2.0 Release: 1%{?dist} Summary: Plugin for Mattermost to have Memes +URL: https://github.com/mattermost/mattermost-plugin-memes License: Apache BuildRequires: golang Requires: mattermost @@ -20,34 +21,31 @@ Requires: mattermost export GOPATH=`pwd` mkdir -p src/github.com/mattermost/ cd src/github.com/mattermost/ -git clone https://github.com/mattermost/mattermost-server -git clone https://github.com/mattermost/mattermost-webapp git clone https://github.com/mattermost/mattermost-plugin-memes -sed -i 's|darwin/amd64 linux/amd64 windows/amd64|linux/amd64 linux/ppc64 linux/ppc64le|' mattermost-plugin-memes/Makefile -sed -i '/tar -czvf dist\/mattermost-memes-plugin-darwin-amd64.tar.gz/d' mattermost-plugin-memes/Makefile -sed -i '/tar -czvf dist\/mattermost-memes-plugin-linux-amd64.tar.gz/d' mattermost-plugin-memes/Makefile -sed -i '/tar -czvf dist\/mattermost-memes-plugin-windows-amd64.tar.gz/d' mattermost-plugin-memes/Makefile -sed -i '/rm -rf dist\/intermediate/d' mattermost-plugin-memes/Makefile %build export GOPATH=`pwd` export PATH="bin:"$PATH +export GO111MODULE=on cd src/github.com/mattermost/mattermost-plugin-memes -make +git checkout tags/v%{version} +go build -o plugin.exe ./server %install -mkdir -p %{buildroot}%{mattermost_home}/plugins/memes/ -cp -rv src/github.com/mattermost/mattermost-plugin-memes/dist/intermediate/* %{buildroot}%{mattermost_home}/plugins/memes/ -cp -rv src/github.com/mattermost/mattermost-plugin-memes/plugin.yaml %{buildroot}%{mattermost_home}/plugins/memes/ -sed -i 's/plugin.exe/plugin_linux_amd64/' %{buildroot}%{mattermost_home}/plugins/memes/plugin.yaml +mkdir -p %{buildroot}%{mattermost_home}/plugins/memes/server/ +cp -rv src/github.com/mattermost/mattermost-plugin-memes/plugin.json %{buildroot}%{mattermost_home}/plugins/memes/ +sed 's/"executables": {/"executables": { "server\/plugin.exe"/' -i %{buildroot}%{mattermost_home}/plugins/memes/plugin.json +sed '/"darwin-amd64"/d' -i %{buildroot}%{mattermost_home}/plugins/memes/plugin.json +sed '/"linux-amd64"/d' -i %{buildroot}%{mattermost_home}/plugins/memes/plugin.json +sed '/"windows-amd64"/d' -i %{buildroot}%{mattermost_home}/plugins/memes/plugin.json +cp -rv src/github.com/mattermost/mattermost-plugin-memes/plugin.exe %{buildroot}%{mattermost_home}/plugins/memes/server/ %files -%{mattermost_home}/plugins/memes/plugin.yaml -%{mattermost_home}/plugins/memes/plugin_linux_amd64 -%{mattermost_home}/plugins/memes/plugin_linux_ppc64 -%{mattermost_home}/plugins/memes/plugin_linux_ppc64le +%{mattermost_home}/plugins/memes/plugin.json +%{mattermost_home}/plugins/memes/server/plugin.exe + %changelog diff --git a/SPECS/mattermost-plugin-profanity-filter.spec b/SPECS/mattermost-plugin-profanity-filter.spec new file mode 100644 index 0000000..4d0fa60 --- /dev/null +++ b/SPECS/mattermost-plugin-profanity-filter.spec @@ -0,0 +1,50 @@ +%define mattermost_user mattermost +%define mattermost_group mattermost +%define mattermost_home /var/lib/mattermost +%define debug_package %{nil} + +Name: mattermost-plugin-profanity-filter +Version: 20200609 +Release: 1%{?dist} +Summary: Plugin for Mattermost to have Memes +URL: https://github.com/mattermost/mattermost-plugin-profanity-filter +License: Apache +BuildRequires: golang +Requires: mattermost + + +%description + + +%prep +%setup -q -T -c %{name}-%{version} +export GOPATH=`pwd` +mkdir -p src/github.com/mattermost/ +cd src/github.com/mattermost/ +git clone https://github.com/mattermost/mattermost-plugin-profanity-filter + + +%build +export GOPATH=`pwd` +export PATH="bin:"$PATH +export GO111MODULE=on +cd src/github.com/mattermost/mattermost-plugin-profanity-filter +go build -o plugin.exe ./server + + +%install +mkdir -p %{buildroot}%{mattermost_home}/plugins/profanity-filter/server/ +cp -rv src/github.com/mattermost/mattermost-plugin-profanity-filter/plugin.json %{buildroot}%{mattermost_home}/plugins/profanity-filter/ +sed 's/"executables": {/"executables": { "server\/plugin.exe"/' -i %{buildroot}%{mattermost_home}/plugins/profanity-filter/plugin.json +sed '/"darwin-amd64"/d' -i %{buildroot}%{mattermost_home}/plugins/profanity-filter/plugin.json +sed '/"linux-amd64"/d' -i %{buildroot}%{mattermost_home}/plugins/profanity-filter/plugin.json +sed '/"windows-amd64"/d' -i %{buildroot}%{mattermost_home}/plugins/profanity-filter/plugin.json +cp -rv src/github.com/mattermost/mattermost-plugin-profanity-filter/plugin.exe %{buildroot}%{mattermost_home}/plugins/profanity-filter/server/ + + +%files +%{mattermost_home}/plugins/profanity-filter/plugin.json +%{mattermost_home}/plugins/profanity-filter/server/plugin.exe + + +%changelog diff --git a/SPECS/mattermost-plugin-zoom.spec b/SPECS/mattermost-plugin-zoom.spec new file mode 100644 index 0000000..5dab54a --- /dev/null +++ b/SPECS/mattermost-plugin-zoom.spec @@ -0,0 +1,57 @@ +%define mattermost_user mattermost +%define mattermost_group mattermost +%define mattermost_home /var/lib/mattermost +%define debug_package %{nil} + +Name: mattermost-plugin-zoom +Version: 1.3.1 +Release: 1%{?dist} +URL: https://github.com/mattermost/mattermost-plugin-zoom +Summary: Plugin for Mattermost and Zoom +License: Apache +BuildRequires: golang +Requires: mattermost + + +%description + + +%prep +%setup -q -T -c %{name}-%{version} +export GOPATH=`pwd` +mkdir -p src/github.com/mattermost/ +cd src/github.com/mattermost/ +git clone https://github.com/mattermost/mattermost-plugin-zoom + + +%build +export GOPATH=`pwd` +export PATH="bin:"$PATH +export GO111MODULE=on +cd src/github.com/mattermost/mattermost-plugin-zoom +git checkout tags/v%{version} +pushd webapp +npm install +npm run build +popd +go build -o plugin.exe ./server + + +%install +mkdir -p %{buildroot}%{mattermost_home}/plugins/zoom/{server,webapp} +cp -rv src/github.com/mattermost/mattermost-plugin-zoom/plugin.json %{buildroot}%{mattermost_home}/plugins/zoom/ +sed 's/"executables": {/"executables": { "server\/plugin.exe"/' -i %{buildroot}%{mattermost_home}/plugins/zoom/plugin.json +sed '/"darwin-amd64"/d' -i %{buildroot}%{mattermost_home}/plugins/zoom/plugin.json +sed '/"linux-amd64"/d' -i %{buildroot}%{mattermost_home}/plugins/zoom/plugin.json +sed '/"windows-amd64"/d' -i %{buildroot}%{mattermost_home}/plugins/zoom/plugin.json +cp -rv src/github.com/mattermost/mattermost-plugin-zoom/plugin.exe %{buildroot}%{mattermost_home}/plugins/zoom/server/ +cp -rv src/github.com/mattermost/mattermost-plugin-zoom/webapp/dist/main.js %{buildroot}%{mattermost_home}/plugins/zoom/webapp/ + + +%files +%{mattermost_home}/plugins/zoom/plugin.json +%{mattermost_home}/plugins/zoom/server/plugin.exe +%{mattermost_home}/plugins/zoom/webapp/main.js + + +%changelog diff --git a/SPECS/mattermost.spec b/SPECS/mattermost.spec index 4384a3a..53dfc33 100644 --- a/SPECS/mattermost.spec +++ b/SPECS/mattermost.spec @@ -5,7 +5,7 @@ %define debug_package %{nil} Name : mattermost -Version : 5.17.0 +Version : 5.23.0 Release : 1%{dist} License : MIT URL : https://mattermost.io @@ -17,6 +17,7 @@ BuildRequires: git BuildRequires: optipng BuildRequires: gifsicle BuildRequires: libwebp-tools +BuildRequires: pngquant %description @@ -37,7 +38,7 @@ git clone https://github.com/mattermost/mattermost-webapp/ %build export GOPATH=`pwd` export GO111MODULE=on -cd src/github.com/mattermost/mattermost-server/ +pushd src/github.com/mattermost/mattermost-server/ git checkout tags/v%{version} git submodule update --init --recursive go get -d ./... @@ -45,26 +46,49 @@ go get -d ./... sed 's/amd64/%{_arch}/g' -i build/release.mk %endif make build-linux -cd ../mattermost-webapp +popd +pushd src/github.com/mattermost/mattermost-webapp/ git checkout tags/v%{version} -npm install +npm install --save +# we need to patch optipng from npm +git clone https://github.com/imagemin/optipng-bin node_modules/optipng-bin/ +sed 's/--with-system-zlib/--with-system-zlib --with-system-libpng/' -i node_modules/optipng-bin/lib/install.js +rm -rf node_modules/optipng-bin/.git/ +cp %{_bindir}/optipng node_modules/optipng-bin/vendor/optipng +rm -rf node_modules/pngquant-bin +git clone https://github.com/imagemin/pngquant-bin node_modules/pngquant-bin +cp %{_bindir}/pngquant node_modules/pngquant-bin/vendor/pngquant +rm -rf node_modules/imagemin-pngquant +git clone https://github.com/imagemin/imagemin-pngquant node_modules/imagemin-pngquant +npm rebuild %ifarch ppc64 ppc64le # because optipng doesn't build on ppc64 or ppc64le -cp %{_bindir}/optipng node_modules/optipng-bin/vendor/optipng -cp %{_bindir}/gifsicle node_modules/gifsicle/vendor/gifsicle -cp %{_bindir}/cwebp node_modules/cwebp-bin/vendor/cwebp -cp %{_bindir}/dwebp node_modules/cwebp-bin/vendor/dwebp +#cp %{_bindir}/optipng node_modules/optipng-bin/vendor/optipng +#cp %{_bindir}/gifsicle node_modules/gifsicle/vendor/gifsicle +#cp %{_bindir}/cwebp node_modules/cwebp-bin/vendor/cwebp +#cp %{_bindir}/dwebp node_modules/cwebp-bin/vendor/dwebp %endif +sed "/import favicon16x16 from 'images\/favicon\/favicon-16x16.png';/d" -i components/favicon_title_handler/favicon_title_handler.tsx +sed "/import favicon32x32 from 'images\/favicon\/favicon-32x32.png';/d" -i components/favicon_title_handler/favicon_title_handler.tsx +sed "/import redDotFavicon32x32 from 'images\/favicon\/favicon-reddot-32x32.png';/d" -i components/favicon_title_handler/favicon_title_handler.tsx +sed "/import redDotFavicon96x96 from 'images\/favicon\/favicon-reddot-96x96.png';/d" -i components/favicon_title_handler/favicon_title_handler.tsx +sed "/const link16x16 = document.querySelector('link\[rel="icon"\]\[sizes="16x16"\]');/d" -i components/favicon_title_handler/favicon_title_handler.tsx +sed "/const link32x32 = document.querySelector('link\[rel="icon"\]\[sizes="32x32"\]');/d" -i components/favicon_title_handler/favicon_title_handler.tsx +sed "/link16x16!.href = typeof redDotFavicon16x16 === 'string' ? redDotFavicon16x16 : '';/d" -i components/favicon_title_handler/favicon_title_handler.tsx +sed "/link32x32!.href = typeof redDotFavicon32x32 === 'string' ? redDotFavicon32x32 : '';/d" -i components/favicon_title_handler/favicon_title_handler.tsx +sed "/link16x16!.href = typeof favicon16x16 === 'string' ? favicon16x16 : '';/d" -i components/favicon_title_handler/favicon_title_handler.tsx +sed "/link32x32!.href = typeof favicon32x32 === 'string' ? favicon32x32 : '';/d" -i components/favicon_title_handler/favicon_title_handler.tsx npm run build +popd %install mkdir -p %{buildroot}%{mattermost_home}/bin/ -install -p -D -m 0555 bin/mattermost %{buildroot}%{mattermost_home}/bin/mattermost -install -p -D -m 0555 bin/platform %{buildroot}%{mattermost_home}/bin/mattermost-platform -install -p -D -m 0555 bin/interface_generator %{buildroot}%{mattermost_home}/bin/mattermost-interface_generator +install -p -D -m 0555 src/github.com/mattermost/mattermost-server/bin/mattermost %{buildroot}%{mattermost_home}/bin/mattermost +#install -p -D -m 0555 src/github.com/mattermost/mattermost-server/bin/platform %{buildroot}%{mattermost_home}/bin/mattermost-platform +install -p -D -m 0555 src/github.com/mattermost/mattermost-server/bin/interface_generator %{buildroot}%{mattermost_home}/bin/mattermost-interface_generator mkdir -p %{buildroot}%{mattermost_home}/config/ -cp -r src/github.com/mattermost/mattermost-server/config/* %{buildroot}%{mattermost_home}/config/ +#cp -r src/github.com/mattermost/mattermost-server/config/* %{buildroot}%{mattermost_home}/config/ #cp -r %{buildroot}%{mattermost_home}/config/default.json %{buildroot}%{mattermost_home}/config/config.json cp -r src/github.com/mattermost/mattermost-server/templates/ %{buildroot}%{mattermost_home}/ cp -r src/github.com/mattermost/mattermost-server/fonts/ %{buildroot}%{mattermost_home}/ @@ -74,7 +98,6 @@ mkdir -p %{buildroot}%{mattermost_home}/data/ mkdir -p %{buildroot}%{mattermost_home}/logs/ mkdir -p %{buildroot}%{mattermost_home}/plugins/ install -p -D -m 0644 %{SOURCE0} %{buildroot}%{_unitdir}/mattermost.service - install -p -D -m 0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/logrotate.d/mattermost @@ -101,7 +124,7 @@ exit 0 %files %defattr(-,%{mattermost_user},%{mattermost_group},-) %attr(555,%{mattermost_user},%{mattermost_group}) %{mattermost_home}/bin/mattermost -%attr(555,%{mattermost_user},%{mattermost_group}) %{mattermost_home}/bin/mattermost-platform +#%attr(555,%{mattermost_user},%{mattermost_group}) %{mattermost_home}/bin/mattermost-platform %attr(555,%{mattermost_user},%{mattermost_group}) %{mattermost_home}/bin/mattermost-interface_generator #%config(noreplace) %{mattermost_home}/config/config.json %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}