Accepting request 708818 from M17N:fonts

- Separate Noto Color Emoji and Noto Emoji fonts into a new project
  due to their different release cycle
- Fix the direct changes to spec file at the previous commit

OBS-URL: https://build.opensuse.org/request/show/708818
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/google-noto-fonts?expand=0&rev=20

generate-specfile.sh

@@ -9,6 +9,8 @@ done
 rm $pkg_name/LICENSE_OFL.txt
 # remove cjk
 rm $pkg_name/*CJK*.?tf
+# remove emoji
+rm $pkg_name/*Emoji*.ttf
 # remove README
 rm $pkg_name/README
 
@@ -41,7 +43,7 @@ ls $pkg_name/ | sed -e 's:Noto::' -e 's:-.*\..tf::' -e 's:\..tf::' -e 's:\.ttc::
   sed -i "s/@SUBPACKAGE_HEADERS@/%package -n $packagename\n@SUBPACKAGE_HEADERS@/" $pkg_name.spec
   sed -i "s/@SUBPACKAGE_HEADERS@/Summary:        $summary\n@SUBPACKAGE_HEADERS@/" $pkg_name.spec
   sed -i "s;@SUBPACKAGE_HEADERS@;Group:          System/X11/Fonts\n@SUBPACKAGE_HEADERS@;" $pkg_name.spec
-  sed -i "s/@SUBPACKAGE_HEADERS@/Requires:       $pkg_name-doc\n@SUBPACKAGE_HEADERS@/" $pkg_name.spec
+  sed -i "s/@SUBPACKAGE_HEADERS@/Recommends:     $pkg_name-doc\n@SUBPACKAGE_HEADERS@/" $pkg_name.spec
   for i in $obsoletes ; do
     sed -i "s/@SUBPACKAGE_HEADERS@/Obsoletes:      $i\n@SUBPACKAGE_HEADERS@/" $pkg_name.spec
     sed -i "s/@SUBPACKAGE_HEADERS@/Provides:       $i\n@SUBPACKAGE_HEADERS@/" $pkg_name.spec

google-noto-fonts.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Jun  3 15:46:48 UTC 2019 - Fuminobu Takeyama <ftake@geeko.jp>
+
+- Separate Noto Color Emoji and Noto Emoji fonts into a new project
+  due to their different release cycle
+- Fix the direct changes to spec file at the previous commit
+
 -------------------------------------------------------------------
 Sat Mar 23 15:31:14 UTC 2019 - Markus S <kamikazow@opensuse.org>
 

google-noto-fonts.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package google-noto-fonts
 #
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -12,7 +12,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
@@ -48,32 +48,6 @@ Group:          Documentation/Other
 %description doc
 License for Google's Noto fonts.
 
-%package -n noto-coloremoji-fonts
-Summary:        Noto Color Emoji Font
-Group:          System/X11/Fonts
-Recommends:     google-noto-fonts-doc
-Obsoletes:      noto-coloremoji
-Provides:       noto-coloremoji
-%reconfigure_fonts_prereq
-
-%description -n noto-coloremoji-fonts
-Noto's design goal is to achieve visual harmonization (e.g., compatible
-heights and stroke thicknesses) across languages. This package contains
-ColorEmoji font, hinted.
-
-%package -n noto-emoji-fonts
-Summary:        Noto Emoji Font
-Group:          System/X11/Fonts
-Recommends:     google-noto-fonts-doc
-Obsoletes:      noto-emoji
-Provides:       noto-emoji
-%reconfigure_fonts_prereq
-
-%description -n noto-emoji-fonts
-Noto's design goal is to achieve visual harmonization (e.g., compatible
-heights and stroke thicknesses) across languages. This package contains
-Emoji font, hinted.
-
 %package -n noto-kufiarabic-fonts
 Summary:        Noto Kufi Arabic Font
 Group:          System/X11/Fonts
@@ -1822,6 +1796,8 @@ Thai font, hinted.
 %setup -q -c -n %{name}-%{version}
 # remove cjk
 rm -rf *CJK*.?tf
+# remove emoji
+rm -rf *Emoji*.ttf
 
 %build
 
@@ -1829,10 +1805,6 @@ rm -rf *CJK*.?tf
 mkdir -p %{buildroot}%{_ttfontsdir}
 cp *.?tf   %{buildroot}%{_ttfontsdir}/
 
-%reconfigure_fonts_scriptlets -n noto-coloremoji-fonts
-
-%reconfigure_fonts_scriptlets -n noto-emoji-fonts
-
 %reconfigure_fonts_scriptlets -n noto-kufiarabic-fonts
 
 %reconfigure_fonts_scriptlets -n noto-mono-fonts
@@ -2105,16 +2077,6 @@ cp *.?tf   %{buildroot}%{_ttfontsdir}/
 %defattr(0644,root,root,755)
 %doc LICENSE*.txt
 
-%files -n noto-coloremoji-fonts
-%defattr(0644,root,root,755)
-%dir %{_ttfontsdir}
-%{_ttfontsdir}/NotoColorEmoji*.?tf
-
-%files -n noto-emoji-fonts
-%defattr(0644,root,root,755)
-%dir %{_ttfontsdir}
-%{_ttfontsdir}/NotoEmoji-*.?tf
-
 %files -n noto-kufiarabic-fonts
 %defattr(0644,root,root,755)
 %dir %{_ttfontsdir}

google-noto-fonts.spec.in

@@ -1,7 +1,7 @@
 #
 # spec file for package google-noto-fonts
 #
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -12,9 +12,10 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
+
 %define hyear     2017
 %define hmonth    09
 %define hday      19
@@ -30,7 +31,7 @@ License:        OFL-1.1
 Group:          System/X11/Fonts
 Url:            https://github.com/googlei18n/noto-fonts
 Source0:        https://noto-website-2.storage.googleapis.com/pkgs/Noto-hinted.zip
-Source1:       generate-specfile.sh
+Source1:        generate-specfile.sh
 BuildRequires:  fontpackages-devel
 BuildRequires:  unzip
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -53,6 +54,8 @@ License for Google's Noto fonts.
 %setup -q -c -n %{name}-%{version}
 # remove cjk
 rm -rf *CJK*.?tf
+# remove emoji
+rm -rf *Emoji*.ttf
 
 %build