瀏覽代碼

updated 2 packages

firefox-78.10.0-1

thunderbird-78.10.0-1
Tomohiro "Tomo-p" KATO 4 年之前
父節點
當前提交
8e067a68c0
共有 2 個文件被更改,包括 11 次插入27 次删除
  1. 6 26
      f/firefox/firefox-vl.spec
  2. 5 1
      t/thunderbird/thunderbird-vl.spec

+ 6 - 26
f/firefox/firefox-vl.spec

@@ -1,8 +1,8 @@
 %bcond_with clang
 
 # do not include minor version number in MOZILLA_FIVE_HOME
-%global ffmajor 78.9
-%global geckomajor 78.9
+%global ffmajor 78.10
+%global geckomajor 78.10
 %global ffminor 0
 %global ffversion %{ffmajor}%{?ffminor:.%{ffminor}}
 %define ffdir %{_libdir}/firefox
@@ -15,17 +15,7 @@
 %define firefox_app_id \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\}
 %define homepage https://vinelinux.org/
 
-%define build_vine7 0
-%define build_vine6 0
-
-# current firefox3 doesn't build on Vine Linux 4.x or older.
-%if "%{?_dist_release}" == "vl7"
-%define build_vine7 1
-%define build_vine6 1
-%endif
-%if "%{?_dist_release}" == "vl6"
-%define build_vine6 1
-%endif
+%global _build_id_links none
 
 %define ffrelease 1%{?_dist_release}
 
@@ -155,9 +145,7 @@ BuildRequires:  lcms-devel
 BuildRequires:  libffi-devel
 BuildRequires:	libgnome-devel
 BuildRequires:  libIDL-devel
-%if %{build_vine7}
 BuildRequires:  libjpeg-turbo-devel >= %{libjpeg_turbo_version}
-%endif
 BuildRequires:  libnotify-devel
 BuildRequires:  libpng-devel
 BuildRequires:	libXt-devel
@@ -167,13 +155,8 @@ BuildRequires:  nasm
 BuildRequires:  nodejs > 10.0.0
 BuildRequires:  pango-devel
 BuildRequires:  pulseaudio-libs-devel
-%if %{build_vine7}
 BuildRequires:  python-devel
 BuildRequires:  python
-%else
-BuildRequires:  python27-devel >= 2.7.3
-BuildRequires:  python27 >= 2.7.3
-%endif
 BuildRequires:  rust >= 1.34.0
 BuildRequires:  cargo
 BuildRequires:  startup-notification-devel
@@ -191,9 +174,7 @@ Provides:       webclient
 Provides:       metainfo()
 Provides:       metainfo(firefox.metainfo.xml)
 
-%if %{build_vine7}
 Conflicts:      xulrunner < 17.0.1
-%endif
 
 AutoProv: 0
 %define _use_internal_dependency_generator 0
@@ -273,11 +254,7 @@ browser/branding/unofficial/locales/browserconfig.properties
 
 %{__rm} -f .mozconfig
 
-%if %build_vine7
 %{__cp} %{SOURCE240} .mozconfig
-%else
-%{__cp} -f %{SOURCE230} .mozconfig
-%endif
 
 #sed -i -e 's/enable-optimize/disable-optimize/g' .mozconfig
 %global optimize_flags "-O3"
@@ -576,6 +553,9 @@ fi
 #---------------------------------------------------------------------
 
 %changelog
+* Mon Apr 19 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 78.10.0-1
+- updated to 78.10.0.
+
 * Thu Mar 25 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 78.9.0-1
 - updated to 78.9.0.
 

+ 5 - 1
t/thunderbird/thunderbird-vl.spec

@@ -1,11 +1,12 @@
 %bcond_with clang
 
 %global disable_elfhack 1
+%global _build_id_links none
 
 Summary:	Thunderbird Community Edition, Mail/newsgroup client
 Summary(ja):	Thunderbirdコミュニティエディション, メール・ニュースクライアント
 Name:		thunderbird
-Version:	78.9.1
+Version:	78.10.0
 Release:	1%{?_dist_release}
 Group:		internet,communication
 Vendor:		Project Vine
@@ -423,6 +424,9 @@ install -m644 %{SOURCE1030} $RPM_BUILD_ROOT%{_datadir}/metainfo/mozilla-thunderb
 #===============================================================================
 
 %changelog
+* Tue Apr 20 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 78.10.0-1
+- new upstream release.
+
 * Sun Apr 11 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 78.9.1-1
 - new upstream release.