From bb227b6245409863beafb2341c54e8d9fe929e54 Mon Sep 17 00:00:00 2001 From: Cockpit Project Date: Thu, 2 Mar 2017 10:58:15 +0000 Subject: [PATCH] Update to 133-1 - Remotely managed machines are now configured in /etc/cockpit/machines.d/*.json - Fix NetworkManager's "MTU" dialog layout - Build the cockpit-tests package for releases too - Split translations into individual packages - Packages now configure alternate cockpit-bridge's to interact with the system --- .gitignore | 1 + ...s-build-the-cockpit-tests-subpackage.patch | 813 ------------------ ...tched-files-handle-case-of-only-one-.patch | 30 - cockpit.spec | 98 ++- sources | 2 +- 5 files changed, 56 insertions(+), 888 deletions(-) delete mode 100644 0001-Always-build-the-cockpit-tests-subpackage.patch delete mode 100644 0002-When-touching-patched-files-handle-case-of-only-one-.patch diff --git a/.gitignore b/.gitignore index 011b234..23307db 100644 --- a/.gitignore +++ b/.gitignore @@ -101,3 +101,4 @@ /cockpit-130.tar.xz /cockpit-131.tar.xz /cockpit-132.tar.xz +/cockpit-133.tar.xz diff --git a/0001-Always-build-the-cockpit-tests-subpackage.patch b/0001-Always-build-the-cockpit-tests-subpackage.patch deleted file mode 100644 index 426da09..0000000 --- a/0001-Always-build-the-cockpit-tests-subpackage.patch +++ /dev/null @@ -1,813 +0,0 @@ -From fb7c4dc20814b68a7b577ab3cf795865b647058a Mon Sep 17 00:00:00 2001 -From: Cockpit Project -Date: Fri, 24 Feb 2017 05:07:38 +0000 -Subject: [PATCH 1/2] Always build the cockpit-tests subpackage - -These will contain the tests for Cockpit, and it's worth building -this regularly even if it's not installed. ---- - dist/dashboard/Makefile.deps | Bin 3206 -> 3206 bytes - dist/dashboard/dashboard.min.js.map | Bin 905740 -> 905740 bytes - dist/docker/Makefile.deps | Bin 5122 -> 5122 bytes - dist/docker/console.min.js.map | Bin 477072 -> 477072 bytes - dist/docker/docker.min.js.map | Bin 2815135 -> 2815135 bytes - dist/docker/test-docker.min.js.map | Bin 880745 -> 880745 bytes - dist/kdump/Makefile.deps | Bin 3510 -> 3510 bytes - dist/kdump/kdump.min.js.map | Bin 394008 -> 394008 bytes - dist/kdump/test-config-client.min.js.map | Bin 260429 -> 260429 bytes - dist/kubernetes/Makefile.deps | Bin 23859 -> 23859 bytes - dist/kubernetes/kubernetes.min.js.map | Bin 7284571 -> 7284571 bytes - dist/kubernetes/registry.min.js.map | Bin 5126555 -> 5126555 bytes - dist/kubernetes/scripts/test-connection.min.js.map | Bin 3241832 -> 3241832 bytes - dist/kubernetes/scripts/test-images.min.js.map | Bin 4467622 -> 4467622 bytes - .../kubernetes/scripts/test-kube-client.min.js.map | Bin 4136351 -> 4136351 bytes - dist/kubernetes/scripts/test-nodes.min.js.map | Bin 5463744 -> 5463744 bytes - dist/kubernetes/scripts/test-projects.min.js.map | Bin 3421656 -> 3421656 bytes - dist/kubernetes/scripts/test-tags.min.js.map | Bin 2487913 -> 2487913 bytes - dist/kubernetes/scripts/test-utils.min.js.map | Bin 2490858 -> 2490858 bytes - dist/kubernetes/scripts/test-volumes.min.js.map | Bin 4496741 -> 4496741 bytes - dist/machines/Makefile.deps | Bin 3094 -> 3094 bytes - dist/machines/machines.min.js.map | Bin 2417399 -> 2417399 bytes - dist/networkmanager/Makefile.deps | Bin 3842 -> 3842 bytes - dist/networkmanager/network.min.js.map | Bin 1061902 -> 1061902 bytes - dist/networkmanager/test-utils.min.js.map | Bin 270795 -> 270795 bytes - dist/ostree/Makefile.deps | Bin 3070 -> 3070 bytes - dist/ostree/ostree.min.js.map | Bin 4362451 -> 4362451 bytes - dist/ostree/test-utils.min.js.map | Bin 2485774 -> 2485774 bytes - dist/playground/Makefile.deps | Bin 8674 -> 8674 bytes - dist/playground/jquery-patterns.min.js.map | Bin 57028 -> 57028 bytes - dist/playground/metrics.min.js.map | Bin 6969 -> 6969 bytes - dist/playground/plot.min.js.map | Bin 483471 -> 483471 bytes - dist/playground/react-patterns.min.js.map | Bin 338127 -> 338127 bytes - dist/playground/service.min.js.map | Bin 34889 -> 34889 bytes - dist/playground/speed.min.js.map | Bin 15729 -> 15729 bytes - dist/playground/test.min.js.map | Bin 15321 -> 15321 bytes - dist/playground/translate.min.js.map | Bin 2361146 -> 2361146 bytes - dist/realmd/Makefile.deps | Bin 1226 -> 1226 bytes - dist/selinux/Makefile.deps | Bin 2464 -> 2464 bytes - dist/selinux/selinux.min.js.map | Bin 1336657 -> 1336657 bytes - dist/shell/Makefile.deps | Bin 5287 -> 5287 bytes - dist/shell/index-no-machines.min.js.map | Bin 144489 -> 144489 bytes - dist/shell/index-stub.min.js.map | Bin 496586 -> 496586 bytes - dist/shell/index.min.js.map | Bin 494426 -> 494426 bytes - dist/sosreport/Makefile.deps | Bin 2148 -> 2148 bytes - dist/sosreport/sosreport.min.js.map | Bin 21422 -> 21422 bytes - dist/storaged/Makefile.deps | Bin 5620 -> 5620 bytes - dist/storaged/storage.min.js.map | Bin 1405943 -> 1405943 bytes - dist/storaged/test-util.min.js.map | Bin 363758 -> 363758 bytes - dist/subscriptions/Makefile.deps | Bin 2888 -> 2888 bytes - dist/subscriptions/subscriptions.min.js.map | Bin 359529 -> 359529 bytes - dist/systemd/Makefile.deps | Bin 4645 -> 4645 bytes - dist/systemd/logs.min.js.map | Bin 137602 -> 137602 bytes - dist/systemd/services.min.js.map | Bin 1446867 -> 1446867 bytes - dist/systemd/system.min.js.map | Bin 953859 -> 953859 bytes - dist/systemd/terminal.min.js.map | Bin 613676 -> 613676 bytes - dist/tuned/Makefile.deps | Bin 1687 -> 1687 bytes - dist/tuned/performance.min.js.map | Bin 283823 -> 283823 bytes - dist/users/Makefile.deps | Bin 1991 -> 1991 bytes - dist/users/users.min.js.map | Bin 391099 -> 391099 bytes - tools/cockpit.spec | 9 --------- - 61 files changed, 9 deletions(-) - -diff --git a/dist/dashboard/Makefile.deps b/dist/dashboard/Makefile.deps -index d333e068293c13aa129255e25ce4d50f753deda7..bdcc28e367ea8b8b07bdf6a0a56a18e3b6a9c0f2 100644 -GIT binary patch -delta 18 -ZcmZpZY?GYe#BOe7Xl!L-w$am;2LLdC1k?Zk - -delta 18 -ZcmZpZY?GYe#BOS3U}qN%ZiA=2%nOi5a -zv`%DgoygWYk$vk#jy@M*EE=azn7|P{-KK+0aJ%>WPWDR$@f{f8Yi|+WNe+t)H;#5 -zbs|gaMAp`cY^@X7w@&2fbHS={`oswwLDOwI*aWwGALd!iG(GzshiiMC2L}*y0x=g5 -Oa|1EY_Bs#VzD@we_${CS - -diff --git a/dist/docker/Makefile.deps b/dist/docker/Makefile.deps -index 8ec420b895b936bf71552f989a16ac689f004a45..c25dfb3dcf882dd96607c7b17a16fc6c6885bfa3 100644 -GIT binary patch -delta 18 -ZcmZqDXwsNq&u(sIXl!L-w$W{mFaR>F1!@2Q - -delta 18 -ZcmZqDXwsNq&u(gEU}61!w>O - -diff --git a/dist/docker/console.min.js.map b/dist/docker/console.min.js.map -index 9258683da2dce73d85cf1e2a2a9f3697cf912e63..015dddf5d7819270e2850ce41a9597a97b58e24c 100644 -GIT binary patch -delta 80 -zcmbQxFFOH%w%@WN`49!xLlT!>$jSL%eTXPv(bD3ImnYZS$2q$Az)IKGd -O1&CR%0Obi-xTXPv(bD3ImnYZS$2q$Az)IKGd -O1&CR_|qNJE;^lD2fDD?M?gF9R9MNX9aesmwlZFh6g9RE$Tm - -delta 210 -zcmZwAISv5<00q$4_kAp5A3K$qF+}AIIxRx~FCbC;XdOTzp;U`AxrKiK#jD@_`|{o8 -zx-qxjVSn&EckV2lrEBk;<7~QG+PnD~gpcqO0U}6*h%gZ$qC|{{6A2MuujI<|c+_smaMHhNeb__J(ODrW4=GPWLe7;A>pix{$GT -zAyex@=GKKQtqWOO7qYc3WZ$}wpix{$GT -zAyex@=GKKQtqWOO7qYc3WZ$}wT*+$nwUH~^p1!VvL - -delta 18 -Zcmdlcy-j+89lNQOfu)tP(MH!oUH~^g1!DjJ - -diff --git a/dist/kdump/kdump.min.js.map b/dist/kdump/kdump.min.js.map -index 1f2578f79f48609bec7775cb57871daf14b69436..c3012cf45d84ba1912e360de8f8d11465638a04c 100644 -GIT binary patch -delta 81 -zcmbQyCNZN;VnUcmvPF`qsfm$+nMHD1qPek=g@Iw}>v!8z}$) - -delta 81 -zcmbQyCNZN;VnUdRd6Kz_g`tUgs<~O3MY55FacXkn?EU8?68U - -diff --git a/dist/kdump/test-config-client.min.js.map b/dist/kdump/test-config-client.min.js.map -index 44e0ecf37b709a1b1e9784808dd56e30de7c310a..189813d256d927c5d3077e0503e5093c0dcf7464 100644 -GIT binary patch -delta 80 -zcmX^6iT~^;{t3yF$reebrY1%PW){h5iRQ*e76yi?_LfPe$&EFwHH=$pm`w9Uu&J5; -Sb2?K{yLbW9cJTscvrYg=u^H|F - -delta 80 -zcmX^6iT~^;{t3yF=1Jxz7KSF~spe*B7Rg2y#;M7P_LeE;rj0eNHH=$pm`w9Uu&J5; -Sb2?K{yLbW9cJTscvrYg`(;7$s - -diff --git a/dist/kubernetes/Makefile.deps b/dist/kubernetes/Makefile.deps -index df0f1faa15284086aec355d62893c0974a7dc0ae..cccae1aff4eaefea3be840d172b591ee33284c76 100644 -GIT binary patch -delta 20 -ccmdnIi*fTV#tF{s=2nKrRwiZ}ynpfy+= -zMVIInanU1sMW1*r`o$YD@Rz~F#ed5u$G_);&|dax(1vW--r75RZy#*LMs3W-ZNfg< -zC;M!Zmas22WnXRDW^C5xY~B{^n|-%MTe4;QVM$xDl>M}{Wo*^fY~40&)3UZ@+b7wp -Hoy*uY3)JW@ - -delta 470 -zcmZwCIZ~4W0EXd_2tg28M8t&v0Z|d~Cjf*s56UWk -z?4`oRd^lRl{7i>Sr{(GD?}!VcOoYTmQ7$S(SX7EjqDoYY%c4eH5w)UD)QbjjRWyog -zqDfpA&Ekf*DQ=0|qD4eRt7sGLA}TsWr??}!#9eVu+!x*Af#?yvqE9>&f#?@8F(Be% -zPz;HL7#1Vqkr)+^#S<|m#t%uR|Nggp^y~LZ5ZW!AB`swWHfc}onLW1`Hf7T`V=ryi -z=4{>;EN!pswY{;owrESXY%8{EYqoA1wrTI|y=5$GIoqqObA^8A!2kdN - -diff --git a/dist/kubernetes/registry.min.js.map b/dist/kubernetes/registry.min.js.map -index bd52d30d91c800002e2aedc755baf5648cee283d..f9f377bda345425e962d3a0e9b36f6e9e88c6794 100644 -GIT binary patch -delta 350 -zcmZwB$u0wN00!{r(5k&PmfBTYTQM_TOci6NmRE3?_*Dd=s;Pk+1$Kg6 -zU>r<<-Cz>z0eitdupb-%2f-mQ1*XAa&<01qQE&_#2Q%OVI0;UH)8Gs^3(kS_U=~~e -zb6_4UfQ#S~xD2j9Od4`77jpS&wXa_8{s7-fhQ0s* - -delta 349 -zcmZwB$w~qN00v-kO0!kV$~IdpvoafJbVf59+xJ%pT%IF{_~{yW7(tN#)VWJ!2=!3C -zK>q`D`0iilw-@Nh>qETemg==aK4&)Trs=qr-L#6H-EdmbNYd{Hz0ecE0Wbg>;2<~z -z2Eh?7#QIsTZT4kv+-EzL=5|OKizYK^$?VC?z?N -kvK&f9j>MCy9LtHE%9)(YgU;<2nDKHIYz%2L*=D<8y0N=pkFH31Bb8kI2hGuYob4yZ|cd1BKYEqYm -bd`MGT(w2^NnP^`<%9UYece6wL3 - -diff --git a/dist/kubernetes/scripts/test-images.min.js.map b/dist/kubernetes/scripts/test-images.min.js.map -index e292aeb3f333d8e7277c586a29ffbe96e1912994..9c5b64bd8b7aeaeb3429a0de5e144d49d87028f7 100644 -GIT binary patch -delta 312 -zcmZwBIZgrr0EOWIiW}mF3+^i_xD3N0h=R*aCXR`nJ(b0aEs2FUAn^c(|0dqR#Dc;b -z_zqz4^piQ;?qyO4Q7Bt%lA#E2Lb -zX)z|o#e|p?Qz9d#MOMs+SurQ(#e&F*MX@B7#fr#_Rk0@4#fI1vTVh-6h+VNK_Qk;` -zg^!=yf3d-H*h;5fyTgJV+L0Yw(Mon=r*>xN7FgLrt60@)R<{dlSko@8Wmk4>ZR^;L -N-P+xtJG?Ko{{ZSYj8Xsq - -delta 312 -zcmZwBIZi?W07cONiWB051I{BVID9_v0a0*R2}omSPi669OJd;;NL+y7?!+CKSWvhF -z-vTU7e+FOu_`v#4*><(wX;;d{pxX(8s2Y~KVXakqjJj{XvHW}bJC}Mv#6(;q#F!Wt -zNiiWN#gv#9Ga@BsMOw^>d9ffC#gfQ~Ww9bw#hS>9b+I8f#g^C>J7QPtiG6V(4#m+Y -zxsRXBf3e|n*hnT`d!w8k+lif8-U@bR=XPP27Ff|jD_Pkp7FpG5R<|o_*tOkQ(^__G -McXmJQjUEckKVd$LwEzGB - -diff --git a/dist/kubernetes/scripts/test-kube-client.min.js.map b/dist/kubernetes/scripts/test-kube-client.min.js.map -index c76b27ff0bb5689865b5cc7dc78369bf19470e68..cd390075be594f896b7d6bc10b46c11dc76041b0 100644 -GIT binary patch -delta 293 -zcmZwBIZgrr0EOWoiu(#KxQn=sItv31u4j=rmc|QESiBfJt?Z=n3Wmb^zm6v`#&-aV -zum5^qKZTyX+*gz6wv$J3oM!Dj>m*V0E^l4ujlA>v8@xSy)XR^Ef*24*F(`&aNeqh- -zF)GHyxR?-=VoFSl88Iv7L|IhCyjT#6Vo6lRvRDzTVoj`z4Y4VJE9_XMOEy5QhN_d|BZ&} -zbE}Yl>ep+wZwGd0M|Nx{7TBqs*}2s%w1zb;vX-?iw!}KtwF|qnE4v={>o?W!KXAWs -A7ytkO - -diff --git a/dist/kubernetes/scripts/test-nodes.min.js.map b/dist/kubernetes/scripts/test-nodes.min.js.map -index 7750e76ac6afd43cd92ac265b27c48c508790eac..dcd2927276b6c598cbf20052188cd88c7187d0a1 100644 -GIT binary patch -delta 352 -zcmZwBw@pI<07X$@a!w|goOAe&*d!Y;IeP?)k0_Xc%C~r;r9%vYsF1t>!{7;c15lj) -zRKI^BReO7iC4z@?7{ueLY%a`}6G8eh%;dvlSO!riBBEY2h(^&QnnjCf6>XwjbcjyT -zCAvkA=oNjUUqr=#7!*TdSj5DL7!_k;Tug{bF(szOjF=U3VqPqWMX@B7#fn%JYhqn& -zh|N!ekKgEj+xPfOvGiK01s1o2B`sxX%h;A>Eoa-dW4pFz`Y -X!Y=K~uIeh<&P+eKSqT&gA#0DFB6}QTd<+Hu{EJEVIO2N)!l%FC51b% -zVh7#@P@Mj3|9(D5jbc48ynU+tX1%FE@yDh1bD5=?<< -z&;c`G7IeWJmB*^_Nng(8LI!dvS8^>kaw|je00q#&UNmTniW~wm@TX$CjBC%(xGRp}HHeprmjI -zR_wsL0E*L}?cXM`mHD(X8oZ51FV8&_jg9FKf-nkR-@}i7 -u?~k#qui?5X*K#8@xs|$jawiRGN=w>uFTOlTM;@gsPhzAe!D_e;zi0oGM`$$w - -diff --git a/dist/kubernetes/scripts/test-tags.min.js.map b/dist/kubernetes/scripts/test-tags.min.js.map -index 70a3942974b07c1c7b7c4a76f9f709b5a6a7c0ee..1c318e8965842b6dc29585a710f56c138e92a92e 100644 -GIT binary patch -delta 210 -zcmZw9I}X8c90%}F?{{gv-)e8`5hfQfS?rC!CQe}d8on`DOnLwZFo`osB+?uB9l-Ee -zKkrWvd5f#xaP6I^Y{!`{mTKX-_H3`_D>YHx2}Fd55*iUB;zWW-5-B20WQZ)0Bl1Ln -zC=w+?C(1;HFrF~CzVR;));DVt^uC(@dfcpg^c)^cQ57{&7Y)%AEzuSo(G@+>7XvXA -MBVoP5!}xgl0U)eYApigX - -delta 210 -zcmZw9xebB<7zWTF-uHbg9@ryzRxV&=V=a=HFoES~@x{W%3I=chE8|QgCWa0C2e5eU -z3qHOQi2JE^Sg!5Ed^R;4+b|YO({jw!#yT#X3kZdX5GoNRVnm!s5J@6Mq=^iXC2~Zb -zC=f-WM3jjNQGKDdKUM$b{?^lXzV=m1@296fBG=HZiMnWrrf7+_=!mZ9iN4UpKn%r5 -MjD`LV-O2g(1IbQPga7~l - -diff --git a/dist/kubernetes/scripts/test-utils.min.js.map b/dist/kubernetes/scripts/test-utils.min.js.map -index ef5b63be9b5d696f2e1b712e66917f9cfb9ce646..95b97f1096c7d15c4a22fa2d90609d3ad14b31cd 100644 -GIT binary patch -delta 194 -zcmZw9w++Hj00dB(oU;LwV{6$YnTlO3KBB=poY09Di3SEiG)&|vxB)0$`{L`_EN!K_UP5EhXjl0=F~6B!~)c -o>ka#LY5mJ@Ze&YaI?@$KdeWDH3}qx^naEUTGMB~2jh5fX4>T`8;s5{u - -delta 194 -zcmZw9xebB<00q!^-#2*QM@tYCv~m`d!bW!ZF+a8@Hadv0aU!Ph4`A`y7hj)=SnlUu -z;O~#YcC)s_qiuV>loCK%9X>bOd1#NH+oCg=cMKBL8fy-b4Tme_XHLwV-gC%eS -zEQ1wr6Wju~!5wfHtbWtEzsdi%?7dZ!yZ%Qz`LbT3t|NQ0FRmQOp&ZGvoQNmB1X7c_ -eG^8n~5=u+XB$9KvkV}cBEgebZsvmW)-P=FI6L~rS - -delta 330 -zcmZwBJ5Is?00!V#U-+yK6crH^rCML5g%+$@s4fm9#0wa(lecjABEBfGhkp|O>T*+!3Z+yFC>1%Lnm - -delta 18 -ZcmbOxF->BEBfF`Ufu)tP(MFGR+yFC&1%3bk - -diff --git a/dist/machines/machines.min.js.map b/dist/machines/machines.min.js.map -index 9bdf9ce54bee16c14ce3a7c27ad649b0c46358c8..16cf0be874c04ef9a53a4629f1b0b0628fa8197a 100644 -GIT binary patch -delta 183 -zcmZw9w++Hj00dB(oTI^HOc=ldY(9HX(vbQq=`4y96&4b+ASPfY7c|@e6t8{p=V`_A -z*x4)3oPvYrFOFt^Ui(Ym1e+@ei%1YjB1NQ$43Q;rM4l)RMWRHMi3(9AYDArA5KY1+ -lT15K==X?LV-@?d|j&!9beHqA5Mlu#xCNh=TJB;R+?GNxGLOcKf - -delta 183 -zcmZw9xedZV00cmp|9=hU{|oS;J4^IINQMj8kjx@j5n&-w3!(yQazMfsKrrcKpQo3} -zFWuihF#p;0frDkS^xk5 - -diff --git a/dist/networkmanager/Makefile.deps b/dist/networkmanager/Makefile.deps -index a82f783c542b5b89ff1bef5b5570590c6077e5f3..932f4a090ea4ac1762564dd162f2a259a154ab16 100644 -GIT binary patch -delta 18 -ZcmZpYYm%Gb&TejHXl!L-w$X139{@4e1z7+9 - -delta 18 -ZcmZpYYm%Gb&TeXDU}oS(sWvs2s*jksdw=Uz@x{R}a6IT7x_q+21P1nE5B)EOSTAs~J?f%<1ftU-3 -Txq+AmhoS(sWvs2s*jksdw=Uz@x{R}a6IT7x_q+21P1nE5B)EOSTAs~J?f%<1ftU-3 -Txq+AmhT*+#b=+yFrI1~dQw - -delta 18 -Zcmew-{!e^@J-exufu)tP(MGo&+yFr91~LEu - -diff --git a/dist/ostree/ostree.min.js.map b/dist/ostree/ostree.min.js.map -index e02c40650d8c9cfcf4319718d9d2801ed8974bf7..313c28ab6a20de138feea35b2d671678e6b7db87 100644 -GIT binary patch -delta 292 -zcmZwBxlux40EN*J6>%2@p9>;xxGN~|0|IVMm>4|A*Mq6S9ltShh6*Ucu@DNN2@CKR -zU~uv?9DJsR_VtvjBykA!MpA3VFL4sThGwYtpYw%x#F$8laWNq#MOsXWjF=WPVphzF -zd9ffC#gfR1Ww9c1A}>}&B-X^b*btkdAhtwNY>SfE5xZhf?2ChM%8${%osUsewnICz -tV>_`^JF|1UuuH30)voN?YF4*~1#4Q%+IC|d>srrl?auChM$yCX+aJ*caLoV! - -delta 292 -zcmZwBxlsZE0EOWZ6)*4vR}s9$TVdJNUBSBv69W}`Fg1ANKSaz}fkikJLIE^k0loqZ -zzWf_}cQXU)Jr&ZuFD3(M)6veU##EMuIC9x*Tq9WGChS(HaVq5HpU9tB=^)dLj^EnKvwr>Y^ -tXh(KzCw6LQc5XGRTWAf7EVc`~w8T=ovZl4{+HUOD?(Dul3?6>p{{T4ba0vha - -diff --git a/dist/ostree/test-utils.min.js.map b/dist/ostree/test-utils.min.js.map -index d37c5769b9d3e8d55ab90a4220025d2cac2c3ec0..44ad0e49321d34fb3688b5f7c78bf12c7a962134 100644 -GIT binary patch -delta 207 -zcmZwAIT8Uu7zWU4`@WBT>~gBiG?5!PfuzwcAy9&^h=#8wa1!MfPT(;90|;LHg6~rW -z;<0VbtkK%@?P6ti#+rj(>iOFD_Q!CpoX}Ot3qb`&z$h34<6r_zf+;W!X22|%1M^@3 -zEP^Gl3|7D@SbNd=nChS8y*W+X==E+LQ5Ox-6fMyf9nlr8=!w1`U|#jHGe|7tjR1ODK%u9je4TDV)T(g%dc8?*NLYe!}ll -z3&mq+`Rd>uow@6|YI$6){MCLDY}P0D5IdR~_ci@WPy-WS5=?<%FPfjg_?Nu5XSbb?i;0*D`yHv- -G<^BVk(Muu# - -diff --git a/dist/playground/Makefile.deps b/dist/playground/Makefile.deps -index 24bfa48ed92c7892224073e8200734e20abe65ee..5a176fc24186881384dd4d4b8c193aa3040fe09b 100644 -GIT binary patch -delta 18 -ZcmaFl{K$ENGrPH!p|O>T*+#D!iU2~=22ub3 - -delta 18 -ZcmaFl{K$ENGrOskfu)tP(MGQsiU2~%22cP1 - -diff --git a/dist/playground/jquery-patterns.min.js.map b/dist/playground/jquery-patterns.min.js.map -index d86f9a15787e8a45bf067795596bd9430abc8aba..0b5a7b8a7311f139b5b6704be2b12546186d288a 100644 -GIT binary patch -delta 57 -vcmX@Im-)zE<_T%S2A0WY7AYo1$*C!c#%5*)X=!E~E4{n1iEqB%{Wb^yKY0{A - -delta 57 -vcmX@Im-)zE<_T%ShDl}y$%(1SCMlMN=7tt&$p!`+E4{n1iEqB%{Wb^yK{FH? - -diff --git a/dist/playground/metrics.min.js.map b/dist/playground/metrics.min.js.map -index d2a60a4014b0c99600ca78ce451f679439484a83..eb3b6bc6553142cc8eac2c4369dcd6a0c265f5ce 100644 -GIT binary patch -delta 63 -zcmdmKw$p4voP>d8vYADSiBWQDN}{ounL%2bnZ2c@VcNtwk{kOoMTN1*Z{`-$V+8<) -Ch7%6} - -delta 63 -zcmdmKw$p4voP=SLnL%=5YO+a+rJ=c@MOw0ffxUThiowJ=k{kOoMTN1*Z{`-$V+8<= -C_7e~Q - -diff --git a/dist/playground/plot.min.js.map b/dist/playground/plot.min.js.map -index 079e4f128f6bb24508bedb2cb0a2ba35c998c518..77a92b14b030a392e2ed8e9d2bd8dc0752c7f56e 100644 -GIT binary patch -delta 94 -zcmeA_DBFKfc0#m-fn~CpMT&`0a%xJVv6-1cTAG=?rKMro#92~}y{)~Bt-VaGz06yC -gS&kQqVNt83qcmMEl2N9;t%wDPS+}irpK - -delta 76 -zcmX?qQRMtZkqN01hDl}y$%(1SCMlMN=7tt&$p!}Y=E*4rjkT?{jIFgyTWgv1EQGPB -PYTswUynUYqi{J+U@#Gn3 - -diff --git a/dist/playground/service.min.js.map b/dist/playground/service.min.js.map -index 86a1c1d15ab097ef692cb90e81e2ab41c59b5890..5493816dee446a9bbc487887143ed0868e0a7421 100644 -GIT binary patch -delta 74 -zcmX>(f$8J~rU`M92A0WY7AYo1$*C!c#%5*)X=!HmmX?NTS`+6>Z=A##B8)}BWQS0Z -O$qiE6o6m;S7y|%+pBL!> - -delta 74 -zcmX>(f$8J~rU`M9hDl}y$%(1SCMlMN=7tt&$p!}Y=E*4rS`+6>Z=A##B8)}BWQS0Z -O$qiE6o6m;S7y|%@Di`Vi - -diff --git a/dist/playground/speed.min.js.map b/dist/playground/speed.min.js.map -index 78b9bc46ca814cd8a16f3d1035d04e241f4b81f1..1d5203e081cb2198c83047e117aae484bfb6e930 100644 -GIT binary patch -delta 75 -zcmexZ^|5L~jHH2OvYADSiBWQDN}{ounL%2bnZ2c@VVc&&c`_R(zSk1NqCiPUY4QUR -PnaQp?=9^z?cL)Li<<1#= - -delta 75 -zcmexZ^|5L~jHF?bnL%=5YO+a+rJ=c@MOw0ffxUThih|7ar - -diff --git a/dist/playground/test.min.js.map b/dist/playground/test.min.js.map -index 90cb0e5852352a7c52030b81bea2645ede200e8f..8916de4e2d8701dee0ee015facd792265a3d5132 100644 -GIT binary patch -delta 64 -zcmcavezSZ+w4{M$vYADSiBWQDN}{ounL%2bnZ2c@VVc&&d9oWP3Tp~uQLuTtrjif< -D!3Gq6 - -delta 64 -zcmcavezSZ+w4`B@nL%=5YO+a+rJ=c@MOw0ffxUThihDNl#%ZPUAa(#j}0l -zd#J@C^i9`0sP%ERIGm3ArBZGXsEy~%gU4IH64by1m;_T`8q9!MFbC$r0$2n~U>U4{ -zRj>xu!3NlTQa{g(Kes)#qunKGMO&p$Z@#08mM}zHn4%-Pq9-iT7XvXABQX~C%XcQ< -F&kqtzLY)8r - -delta 201 -zcmZw9yAHu%7zW@tpU+iAooc0N6KR=Tg~?L>atUHJys^9yre29idKE@-HNFclJnIwR -z?ul631H;{Wj@lj6B3!w?yF4n#S^Fw<9&hbJFaajP6qp7xU>3}Qd9VN$!4g;oD_|9@ -zfpxF}Ho?}D+G(!;xviNMZO3te=CA-bX``oa_gF%%;)787B;0(<)X -F`~V$#LY@Es - -diff --git a/dist/realmd/Makefile.deps b/dist/realmd/Makefile.deps -index 4bb1a0a5cf5fed299488d5c83f9f887b602ba456..3ae83f9db44f867061698c55c6a7c158de07b583 100644 -GIT binary patch -delta 18 -ZcmX@bd5Uv_J-fM;p|O>T*+#b(763Qh1$6)b - -delta 18 -ZcmX@bd5Uv_J-exufu)tP(MGox763QY1#T*+%zBP5?7V1rY!M - -delta 18 -ZcmZ1=yg+z@1G}k}fu)tP(MI=3P5?7M1rGoK - -diff --git a/dist/selinux/selinux.min.js.map b/dist/selinux/selinux.min.js.map -index a15da0e9a56f3301036c227453fdba566594ba6a..693f956d137790af7c51c0ec2fd8cd3b52dae1ad 100644 -GIT binary patch -delta 142 -zcmcb3D)8c|zzIwG$lLJKLC(je%X`IT*+$nS5db#x1zP|B - -delta 18 -ZcmZ3kxm>O%1|WRJUt2vH&qF5VLL9YGhv^1OQW!99#eZ - -delta 92 -zcmX@LT<+9zxd}0nsi_90Y3AlBX$F=CCPryVW@*Ou7OBQ5T9X$tDKt)Poyyocm8o?q -d^VX>>O%1|WRJUt2vH&qF5VLL9YGhv^1OUAC9%=vp - -diff --git a/dist/shell/index.min.js.map b/dist/shell/index.min.js.map -index 88ae30aa455981d372ec3e59ad8f6ac6da4e1170..e91dd653281849ff9b30f5dcecc31d7a2ab6d10d 100644 -GIT binary patch -delta 92 -zcmcaLP43n-xe4LI#wG^liRQ@$MwZ6rrb))81_maR8Cj$oTU%QhTU(i0TbZ}EvZPjH -bQ@8!xGZqu(cEfrWAZ7((w(W-X?3z3PHW3@- - -delta 92 -zcmcaLP43n-xe4LIsi_90Y3AlBX$F=CCPryVW@*Ng8Cj$oTU%QhTU(i0TbZ}EvZPjH -bQ@8!xGZqu(cEfrWAZ7((w(W-X?3z3PqoEz> - -diff --git a/dist/sosreport/Makefile.deps b/dist/sosreport/Makefile.deps -index 00ad75910049194c303b3c23310b12915d986890..3cbb38f353afeb61efb4b419f875fc6fac8ff571 100644 -GIT binary patch -delta 18 -ZcmaDN@I+vO6T7*Up|O>T*+x%k4gfoo1y}$8 - -delta 18 -ZcmaDN@I+vO6T7LEfu)tP(MC^c4gfof1y%q6 - -diff --git a/dist/sosreport/sosreport.min.js.map b/dist/sosreport/sosreport.min.js.map -index 90a2c05fb91b1747ea2ecb94a5d46572aa4d4347..eabc693a10c4517286260f7f4ac284b07ea12104 100644 -GIT binary patch -delta 62 -zcmZ3toN?W9#tCsE#%7iV=4r_(24*H{sc9yrmS(2r6Yt1xoG4?4Rc`Y^v$rw;dma=Z - -delta 62 -zcmZ3toN?W9#tCsE1{NtPmWBpqmgbg*M&?PzrY5Or6Yt1xoG4?4Rc`Y^v$rw;Y8Df& - -diff --git a/dist/storaged/Makefile.deps b/dist/storaged/Makefile.deps -index 1c8354f6c1f5c3ba0395e49811889ed4c92f282b..ff365442cb12a02fc4151276001e71bda8b2c70b 100644 -GIT binary patch -delta 18 -ZcmeyO{Y86%BfGhkp|O>T*+!2wq5wiN21)<` - -delta 18 -ZcmeyO{Y86%BfF`Ufu)tP(MFFoq5wiE21oz^ - -diff --git a/dist/storaged/storage.min.js.map b/dist/storaged/storage.min.js.map -index bcd14c31140e0e2c4f224df997fa46f599398621..cba6b3a0fd06fafe6734a15fa75249ac7235da68 100644 -GIT binary patch -delta 138 -zcmezVJoNkX&~e``NuYd=$KKXYq8OKU%C -zYd>3SKYMFGM{7T4Yd=?OKlj#to)sUk8nFH13PBU*_WCb8K+Frod_c?(!~#Gp2*g4_ -MEWEw`i%3O10PBf1lK=n! - -delta 138 -zcmezVJoNkX&`&nB1 -zSzG(rTKm~s`#DH&|^ICB61 - -diff --git a/dist/storaged/test-util.min.js.map b/dist/storaged/test-util.min.js.map -index 84d68910d80476edc18c41dd384c5e350195ecbe..a0762c0a1ddf19e1b5dc17ef161aceab689acce6 100644 -GIT binary patch -delta 101 -zcmaDiQ|#SLu?ew~=Elax7Rkv;W~l~d2Bro;GSS@LDAB-d;#;}tacRsvjSE^AFt#pW -m+PZ)_DOLoV^67?~nS-{!(Pr7g)Gm|A48$zkWfEC0X#)VgfguL~ - -delta 101 -zcmaDiQ|#SLu?ew~CaFoOiALteDTYa@#;HjLW|k?*_J(ODX%pYdO^-`s=4o8ex`45D -n0n^q6%t^5#*pyE<+{_%b{f#!u7N&NYL}nmn*)EgFdPy4qJT)U9 - -diff --git a/dist/subscriptions/Makefile.deps b/dist/subscriptions/Makefile.deps -index d892afe3fb0b6d00474a14024bda8b373d814a81..94b3c1a9c8d9130bb87adc899acec30e7345a8bd 100644 -GIT binary patch -delta 18 -ZcmX>hc0z1|8@sucp|O>T*+$>rTmU+q1{MGS - -delta 18 -ZcmX>hc0z1|8@s8Mfu)tP(MI3jTmU+h1{44Q - -diff --git a/dist/subscriptions/subscriptions.min.js.map b/dist/subscriptions/subscriptions.min.js.map -index 45a34ef2942af7b88f0c8a858d0fdc1ca8baf6de..6e33a8f69a42f6a2a74ae347c7993a5e71845821 100644 -GIT binary patch -delta 86 -zcmaF)L-gej(FtiH=B8-|h6ZMqNy%yEsip>LNofXVlX)4Hr{Ak$W}oQB*SM*56JzTp -YrmdTpt+KJIZp&eA%VF7;!T*+%z!f&e!p1b}VVZ$?qPdyb#z`ru$rdSwiKdoDDQV^@sm4i3_Lhlh=8Yw-C5){lOsyr%ttBk2 -zC9JI_Y^^2ittA|-C7i7#T&*SCttC8LOL#@uMX(vtK9`*ri1~n+ABY8jSP+PXfLIua -OMSxgz`&@Q0Gadk15iR2Y - -delta 140 -zcmcb-JmT{5hzZe>sYw>8MnaZ*ZZvPFtvqN$}(N}72}s&P`1y=7vWd1Fy)5o2o+Q)>}(YY|Ip -p5o>D^TWb;f)*_C_mqoDYYR|mF0mPg@%mu{UK+Ll}^9t{*od8QrDDD6N - -delta 109 -zcmZpkW7RyzYC@!BYLZ2&k&$Uys)>b}VVZ$?qPdxweWG!Sabr}(YY|Ip -p5o>D^TWb;f)*_C_mqoDYYR|mF0mPg@%mu{UK+Ll}^9t{*odDjECmH|% - -diff --git a/dist/systemd/terminal.min.js.map b/dist/systemd/terminal.min.js.map -index a8b25a4b948435a1b42b5f3c2aa38c8ccb1f2e5e..e05a80d969285336118417503894522365c9b7e2 100644 -GIT binary patch -delta 92 -zcmZ3pOLfgI)d|s(#z`ru$rdSwiKdoDDQV^@sm4i3_Lhlh=8Yw-C5){lOsyr%ttBj5 -cOIX!+iC|OQzJ3=g5VHX>`}Xy_IBFLG0Qt2dU;qFB - -delta 92 -zcmZ3pOLfgI)d|s(sYw>8Mn`}Xy_IBFLG0Hhfpi~s-t - -diff --git a/dist/tuned/Makefile.deps b/dist/tuned/Makefile.deps -index 8b38536101bc7e7f1d2e1802e321e001f408e7a6..7aca0bf8870ca8b6c97b9f6d38d4949c65e3d3a7 100644 -GIT binary patch -delta 18 -ZcmbQvJDqoe9lN=ep|O>T*+$nOHUKdt1myq# - -delta 18 -ZcmbQvJDqoe9lNQOfu)tP(MH!GHUKdk1mgez - -diff --git a/dist/tuned/performance.min.js.map b/dist/tuned/performance.min.js.map -index e4c86b1c68f6834dd4763adba102a5f115dd7c75..82d6d3c1494ffb21361b029396a182ae5dba6c45 100644 -GIT binary patch -delta 75 -zcmZ3#QgHoB!3i-UCZ?w5rskT*+$nUb^tgg1$qDg - -delta 18 -ZcmX@kf1H1U9lNQOfu)tP(MH!Mb^tgX1$Y1e - -diff --git a/dist/users/users.min.js.map b/dist/users/users.min.js.map -index a17f86587ea21d57ffccf45d3183a2a5e9ca6df6..368d6efa23076a4d5cd6b05d4811a651e289a41d 100644 -GIT binary patch -delta 85 -zcmdn}UVQg^@d;rf7Dg6nCT7W&29}AYmT9S$CTYnAlM5N88(Ujj8CzSKwze{VS|N-@ -X)pWtRtfKAnS26=J%l7#zS!MhH3S=GB - -delta 86 -zcmdn}UVQg^@d;rfrY6Q|rfEhdi57+_iRR{MmL?{~lM5N88(Ujj8CzSKwze{VT7gy7 -Wbh{wdp!T~fnSq#P``wkS_j~~zK_4Xm - -diff --git a/tools/cockpit.spec b/tools/cockpit.spec -index 0a97e45..4b309a9 100644 ---- a/tools/cockpit.spec -+++ b/tools/cockpit.spec -@@ -148,11 +148,7 @@ make -j4 check - - %install - make install DESTDIR=%{buildroot} --%if %{defined wip} || 0%{?rhel} - make install-test-assets DESTDIR=%{buildroot} --%else --rm -rf %{buildroot}/%{_datadir}/%{name}/playground --%endif - mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/pam.d - install -p -m 644 tools/cockpit.pam $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/cockpit - rm -f %{buildroot}/%{_libdir}/cockpit/*.so -@@ -592,9 +588,6 @@ cluster. Installed on the Kubernetes master. This package is not yet complete. - - %endif - --# we only build test assets on rhel or if we're building from a specific commit --%if %{defined wip} || 0%{?rhel} -- - %package tests - Summary: Tests for Cockpit - Requires: %{name}-bridge >= %{required_base} -@@ -612,7 +605,5 @@ These files are not required for running Cockpit. - %{_datadir}/%{name}/playground - %{_prefix}/lib/cockpit-test-assets - --%endif -- - # The changelog is automatically generated and merged - %changelog --- -2.9.3 - diff --git a/0002-When-touching-patched-files-handle-case-of-only-one-.patch b/0002-When-touching-patched-files-handle-case-of-only-one-.patch deleted file mode 100644 index 7f39db5..0000000 --- a/0002-When-touching-patched-files-handle-case-of-only-one-.patch +++ /dev/null @@ -1,30 +0,0 @@ -From f920c1611c8d34c3238b8d7fcbabf473a3525c9a Mon Sep 17 00:00:00 2001 -From: Cockpit Project -Date: Fri, 24 Feb 2017 05:20:38 +0000 -Subject: [PATCH 2/2] When touching patched files handle case of only one file - -When touching patched files so that they all have the same utime -we need to handle the case where only one file is patched. -Otherwise we get: - -touch: missing file operand ---- - tools/cockpit.spec | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tools/cockpit.spec b/tools/cockpit.spec -index 4b309a9..c81bb51 100644 ---- a/tools/cockpit.spec -+++ b/tools/cockpit.spec -@@ -133,7 +133,7 @@ if [ -n "%{patches}" ]; then - git config core.autocrlf false && git config core.safecrlf false && git config gc.auto 0 - git add -f . && git commit -a -q -m "Base" && git tag -a initial --message="initial" - git am --whitespace=nowarn %{patches} -- touch -r $(git diff --name-only initial..HEAD) -+ touch -r $(git diff --name-only initial..HEAD) .git - rm -rf .git - fi - --- -2.9.3 - diff --git a/cockpit.spec b/cockpit.spec index 72eca2b..56f83e7 100644 --- a/cockpit.spec +++ b/cockpit.spec @@ -1,8 +1,6 @@ # This spec file has been automatically updated -Version: 132 +Version: 133 Release: 1%{?dist} -Patch1: 0002-When-touching-patched-files-handle-case-of-only-one-.patch -Patch2: 0001-Always-build-the-cockpit-tests-subpackage.patch # # This file is maintained at the following location: # https://github.com/cockpit-project/cockpit/blob/master/tools/cockpit.spec @@ -17,8 +15,8 @@ Patch2: 0001-Always-build-the-cockpit-tests-subpackage.patch # * wip 1 # -# earliest base that the subpackages work on; this gets computed/updated by -# tools/min-base-version during "make dist", but keep a hardcoded fallback +# earliest base that the subpackages work on; the instances of this get computed/updated +# by tools/gen-spec-dependencies during "make dist", but keep a hardcoded fallback %define required_base 122 %if 0%{?centos} @@ -150,7 +148,7 @@ make -j4 check %install make install DESTDIR=%{buildroot} -make install-test-assets DESTDIR=%{buildroot} +make install-tests DESTDIR=%{buildroot} mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/pam.d install -p -m 644 tools/cockpit.pam $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/cockpit rm -f %{buildroot}/%{_libdir}/cockpit/*.so @@ -164,6 +162,7 @@ echo '{ "linguas": null, "machine-limit": 5 }' > %{buildroot}%{_datadir}/%{name} # Build the package lists for resource packages echo '%dir %{_datadir}/%{name}/base1' > base.list find %{buildroot}%{_datadir}/%{name}/base1 -type f >> base.list +echo '%{_sysconfdir}/cockpit/machines.d' >> base.list %if %{defined build_dashboard} echo '%dir %{_datadir}/%{name}/dashboard' >> dashboard.list @@ -173,6 +172,9 @@ rm -rf %{buildroot}/%{_datadir}/%{name}/dashboard touch dashboard.list %endif +echo '%dir %{_datadir}/%{name}/pcp' >> pcp.list +find %{buildroot}%{_datadir}/%{name}/pcp -type f >> pcp.list + echo '%dir %{_datadir}/%{name}/realmd' >> system.list find %{buildroot}%{_datadir}/%{name}/realmd -type f >> system.list @@ -302,8 +304,8 @@ embed or extend Cockpit. %package machines Summary: Cockpit user interface for virtual machines -Requires: %{name}-bridge >= %{required_base} -Requires: %{name}-system >= %{required_base} +Requires: %{name}-bridge >= 122 +Requires: %{name}-system >= 122 Requires: libvirt Requires: libvirt-client @@ -315,8 +317,8 @@ The Cockpit components for managing virtual machines. %package ostree Summary: Cockpit user interface for rpm-ostree # Requires: Uses new translations functionality -Requires: %{name}-bridge > 124 -Requires: %{name}-system > 124 +Requires: %{name}-bridge >= 124.x +Requires: %{name}-system >= 124.x %if 0%{?fedora} > 0 && 0%{?fedora} < 24 Requires: rpm-ostree >= 2015.10-1 %else @@ -336,7 +338,7 @@ Requires: pcp %description pcp Cockpit support for reading PCP metrics and loading PCP archives. -%files pcp +%files pcp -f pcp.list %{_libexecdir}/cockpit-pcp %{_localstatedir}/lib/pcp/config/pmlogconf/tools/cockpit @@ -372,7 +374,7 @@ Summary: Cockpit user interface for storage, using Storaged %if 0%{?rhel} Requires: %{name}-bridge >= %{version}-%{release} %endif -Requires: %{name}-shell >= %{required_base} +Requires: %{name}-shell >= 122 Requires: storaged >= 2.1.1 %if 0%{?fedora} >= 24 || 0%{?rhel} >= 8 Recommends: storaged-lvm2 >= 2.1.1 @@ -426,6 +428,23 @@ This package contains the Cockpit shell and system configuration interfaces. %files system -f system.list +%package tests +Summary: Tests for Cockpit +Requires: %{name}-bridge >= %{version}-%{release} +Requires: %{name}-shell >= %{version}-%{release} +Requires: openssh-clients +Provides: %{name}-test-assets +Obsoletes: %{name}-test-assets < 132 + +%description tests +This package contains tests and files used while testing Cockpit. +These files are not required for running Cockpit. + +%files tests +%{_unitdir}/cockpit.service.d +%{_datadir}/%{name}/playground +%{_prefix}/lib/cockpit-test-assets + %package ws Summary: Cockpit Web Service Requires: glib-networking @@ -444,7 +463,7 @@ The Cockpit Web Service listens on the network, and authenticates users. %doc %{_mandir}/man8/cockpit-ws.8.gz %doc %{_mandir}/man8/remotectl.8.gz %doc %{_mandir}/man8/pam_ssh_add.8.gz -%config(noreplace) %{_sysconfdir}/%{name} +%config(noreplace) %{_sysconfdir}/%{name}/ws-certs.d %config(noreplace) %{_sysconfdir}/pam.d/cockpit %{_unitdir}/cockpit.service %{_unitdir}/cockpit.socket @@ -481,8 +500,8 @@ test -f %{_bindir}/firewall-cmd && firewall-cmd --reload --quiet || true %package kdump Summary: Cockpit user interface for kernel crash dumping -Requires: %{name}-bridge >= %{required_base} -Requires: %{name}-shell >= %{required_base} +Requires: %{name}-bridge >= 122 +Requires: %{name}-shell >= 122 Requires: kexec-tools BuildArch: noarch @@ -493,8 +512,8 @@ The Cockpit component for configuring kernel crash dumping. %package sosreport Summary: Cockpit user interface for diagnostic reports -Requires: %{name}-bridge >= %{required_base} -Requires: %{name}-shell >= %{required_base} +Requires: %{name}-bridge >= 122 +Requires: %{name}-shell >= 122 Requires: sos BuildArch: noarch @@ -506,8 +525,8 @@ sosreport tool. %package subscriptions Summary: Cockpit subscription user interface package -Requires: %{name}-bridge >= %{required_base} -Requires: %{name}-shell >= %{required_base} +Requires: %{name}-bridge >= 122 +Requires: %{name}-shell >= 122 Requires: subscription-manager >= 1.13 BuildArch: noarch @@ -519,8 +538,8 @@ subscription management. %package networkmanager Summary: Cockpit user interface for networking, using NetworkManager -Requires: %{name}-bridge >= %{required_base} -Requires: %{name}-shell >= %{required_base} +Requires: %{name}-bridge >= 122 +Requires: %{name}-shell >= 122 Requires: NetworkManager # Optional components (only when soft deps are supported) %if 0%{?fedora} >= 24 || 0%{?rhel} >= 8 @@ -539,8 +558,8 @@ The Cockpit component for managing networking. This package uses NetworkManager %package selinux Summary: Cockpit SELinux package -Requires: %{name}-bridge >= %{required_base} -Requires: %{name}-shell >= %{required_base} +Requires: %{name}-bridge >= 122 +Requires: %{name}-shell >= 122 Requires: setroubleshoot-server >= 3.3.3 BuildArch: noarch @@ -556,8 +575,8 @@ utility setroubleshoot to diagnose and resolve SELinux issues. %package docker Summary: Cockpit user interface for Docker containers -Requires: %{name}-bridge >= %{required_base} -Requires: %{name}-shell >= %{required_base} +Requires: %{name}-bridge >= 122 +Requires: %{name}-shell >= 122 Requires: docker >= 1.3.0 Requires: python @@ -575,8 +594,8 @@ This package is not yet complete. Summary: Cockpit user interface for Kubernetes cluster Requires: /usr/bin/kubectl # Requires: Needs newer localization support -Requires: %{name}-bridge > 124 -Requires: %{name}-shell > 124 +Requires: %{name}-bridge >= 124.x +Requires: %{name}-shell >= 124.x BuildRequires: golang-bin BuildRequires: golang-src @@ -590,25 +609,16 @@ cluster. Installed on the Kubernetes master. This package is not yet complete. %endif -%package tests -Summary: Tests for Cockpit -Requires: %{name}-bridge >= %{required_base} -Requires: %{name}-shell >= %{required_base} -Requires: openssh-clients -Provides: %{name}-test-assets -Obsoletes: %{name}-test-assets < 132 - -%description tests -This package contains tests and files used while testing Cockpit. -These files are not required for running Cockpit. - -%files tests -%{_sysconfdir}/systemd/system/cockpit.service.d -%{_datadir}/%{name}/playground -%{_prefix}/lib/cockpit-test-assets - # The changelog is automatically generated and merged %changelog +* Thu Mar 02 2017 Martin Pitt <> - 133-1 + +- Remotely managed machines are now configured in /etc/cockpit/machines.d/*.json +- Fix NetworkManager's "MTU" dialog layout +- Build the cockpit-tests package for releases too +- Split translations into individual packages +- Packages now configure alternate cockpit-bridge's to interact with the system + * Thu Feb 23 2017 Martin Pitt <> - 132-1 - Make basic SELinux functionality available without setroubleshootd diff --git a/sources b/sources index 80d4098..d24e1eb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cockpit-132.tar.xz) = 117e672c2b6047d778ed96ea7369773397aa9a967e0e2fc8e31f77d67a56c7562d99dc6b7cd7e7429f7ba9ab051d497e92cbad87ce09ca5872b7afb83399f5e4 +SHA512 (cockpit-133.tar.xz) = 91381d5bb5293eb421f0a400e7b5b3b57260fcd1f45a05e15499c93a39d384bcddc86d1a473613e2af2278547c99a8bf06b1b8a85da5c2c7e0dad10043abbdfa