More Debranding

3 months ago · afdad40f5c
parent e4b9698dde
commit afdad40f5c
4 changed files with 15 additions and 9 deletions
--- a/.nginx.metadata
+++ b/.nginx.metadata
@ -1,2 +1,2 @@
 77ce4d26481b62f7a9d83e399454df0912f01a4b SOURCES/nginx-1.16.1.tar.gz
-2ec82988cd0d9b1304c95a16b28eff70f0f69abc SOURCES/poweredby.png
+d315ab9773e45d89d8bd443bef9b1d9b59ec9411 SOURCES/poweredby.png
--- a/SOURCES/404.html
+++ b/SOURCES/404.html
@ -7,7 +7,7 @@
        <style type="text/css">
            /*<![CDATA[*/
            body {
-                background-color: #8ec07c;
+                background-color: #fff;
                color: #000;
                font-size: 0.9em;
                font-family: sans-serif,helvetica;
@ -111,9 +111,9 @@
                    alt="[ Powered by nginx ]"
                    width="121" height="32" /></a>
                <a href="https://www.msvsphere-os.ru/"><img
-                    src="icons/poweredby.png"
+                    src="poweredby.png"
                    alt="[ Powered by MSVSphere ]"
-                    width="294" height="31" /></a>
+                    width="163" height="32" /></a>
            </div>
        </div>
    </body>
--- a/SOURCES/50x.html
+++ b/SOURCES/50x.html
@ -7,7 +7,7 @@
        <style type="text/css">
            /*<![CDATA[*/
            body {
-                background-color: #8ec07c;
+                background-color: #fff;
                color: #000;
                font-size: 0.9em;
                font-family: sans-serif,helvetica;
@ -111,9 +111,9 @@
                    alt="[ Powered by nginx ]"
                    width="121" height="32" /></a>
                <a href="https://www.msvsphere-os.ru/"><img
-                    src="icons/poweredby.png"
+                    src="poweredby.png"
                    alt="[ Powered by MSVSphere ]"
-                    width="294" height="31" /></a>
+                    width="163" height="32" /></a>
            </div>
        </div>
    </body>
--- a/SPECS/nginx.spec
+++ b/SPECS/nginx.spec
@ -87,6 +87,8 @@ Requires:          nginx-mimetypes
 %endif
 Provides:          webserver

+Requires:          system-logos-httpd
+
 BuildRequires:     systemd
 Requires(post):    systemd
 Requires(preun):   systemd
@ -300,10 +302,11 @@ install -p -d -m 0755 %{buildroot}%{_libdir}/nginx/modules

 install -p -m 0644 ./nginx.conf \
    %{buildroot}%{_sysconfdir}/nginx
-install -p -m 0644 %{SOURCE100} \
-    %{buildroot}%{_datadir}/nginx/html
+#install -p -m 0644 %{SOURCE100} \
+#    %{buildroot}%{_datadir}/nginx/html
 pushd %{buildroot}%{_datadir}/nginx/html/
 ln -s ../../pixmaps/test-page-background.png .
+ln -sf ../../testpage/index.html .
 popd
 install -p -m 0644 %{SOURCE101} %{SOURCE102} \
    %{buildroot}%{_datadir}/nginx/html
@ -472,6 +475,9 @@ fi


 %changelog
+* Fri Aug 16 2024 Arkady L. Shane <tigro@msvsphere-os.ru> - 1:1.16.1-2.1.inferit
+- More Debranding
+
 * Tue Dec 19 2023 Sergey Cherevko <s.cherevko@msvsphere-os.ru> - 1:1.16.1-2.1.inferit
 - Debranded for MSVSphere
 - Rebuilt for MSVSphere 8.8