updated 3 packages

gedit-3.36.2-1

tepl-4.4.0-2

uchardet-0.0.6-12

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@12457 ec354946-7b23-47d6-9f5a-488ba84defc7

g/gedit/gedit-vl.spec

@@ -1,43 +1,46 @@
-%{!?python3_sitearch: %define python3_sitearch %(python3 -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
-
-%define glib2_version 2.48.0
-%define gtk3_version 3.20.0
-%define desktop_file_utils_version 0.17
-%define gtksourceview3_version 3.20.0
-
 Summary:	gedit is a small but powerful text editor for GNOME.
 Summary(ja):	GNOME 用の小さくかつ強力なテキストエディタ
 Name:		gedit
-Version:	3.20.2
+Group:		accessories,desktop-gnome
+Version:	3.36.2
 Release:	1%{?_dist_release}
+Vendor:		Project Vine
+Distribution:	Vine Linux
+Packager:	daisuke, inagaki
+
 License:	GPLv2
-Group:		Applications/Editors
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/gedit/3.20/%{name}-%{version}.tar.xz
-URL:		http://gedit.sourceforge.net/
+URL:		https://wiki.gnome.org/Apps/Gedit
+%global		shortver %(echo %{version} | cut -d . -f 1,2)
+Source0:	https://download.gnome.org/sources/%{name}/%{shortver}/%{name}-%{version}.tar.xz
+# https://gitlab.gnome.org/GNOME/gedit/-/commit/5e0909c19f267b4023131881fac89c58a2a17453
+Patch1:		restore-overlay-scrollbars.patch
+
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 
-Requires: pygobject3
+Requires: python3-pygobject
 
-BuildRequires: glib2-devel >= %{glib2_version}
-BuildRequires: gtk3-devel >= %{gtk3_version}
-BuildRequires: desktop-file-utils >= %{desktop_file_utils_version}
-BuildRequires: gtksourceview3-devel >= %{gtksourceview3_version}
-BuildRequires: pygobject3-devel
+BuildRequires: meson
+BuildRequires: gnome-common
+BuildRequires: glib2-devel
+BuildRequires: gtk3-devel
+BuildRequires: gtksourceview4-devel
+BuildRequires: tepl-devel
+BuildRequires: libpeas-devel
+BuildRequires: gspell-devel
+BuildRequires: libX11-devel
+BuildRequires: gobject-introspection-devel
+BuildRequires: vala-tools
+BuildRequires: vala-devel
+BuildRequires: python3-rpm-macros
 BuildRequires: python3-pygobject
-BuildRequires: perl-XML-Parser
-BuildRequires: libattr-devel
-BuildRequires: libffi-devel
-BuildRequires: libSM-devel
-BuildRequires: libpeas-devel >= 0.7.3
+BuildRequires: pygobject3-devel
 BuildRequires: gsettings-desktop-schemas-devel
+BuildRequires: desktop-file-utils
 BuildRequires: yelp-tools
-BuildRequires: intltool > 0.40
-BuildRequires: autoconf
-BuildRequires: gnome-common
-
-Vendor: Project Vine
-Distribution: Vine Linux
-Packager:	daisuke, inagaki, Takemikaduchi
+BuildRequires: gtk-doc
+BuildRequires: itstool
+Obsoletes: gedit-python3-plugins < 3.36.0
+Provides: gedit-python3-plugins = %{version}-%{release}
 
 %description
 gedit is a small but powerful text editor designed specifically for
@@ -59,23 +62,12 @@ gedit は GNOME 用の小さく、それでいて、強力なテキストエデ
 gedit には GNOME と GTK+2 が必要です
 
 
-%package python3-plugins
-Summary: The python3 plugins for gedit
-Summary(ja): gedit エディタ用 python3 プラグイン集
-Group: Applications/Editors
-Requires: %{name} = %{version}-%{release}
-Requires: python3-pygobject
-
-%description python3-plugins
-%{summary}
-
-
 %package devel
 Summary: The files needed for developing plug-ins for the gedit editor.
 Summary(ja): gedit エディタ用のプラグイン開発
-Group: Development/Libraries
+Group: programming,desktop-gnome
 Requires: %{name} = %{version}-%{release}
-Requires: gtksourceview3-devel >= %{gtksourceview3_version}
+Requires: gtksourceview4-devel
 
 %description devel
 gedit is a small but powerful text editor for the GNOME GUI desktop.
@@ -89,43 +81,27 @@ gedit は GNOME 用の小さく、それでいて、強力なテキストエデ
 
 gedit のプラグインを開発する場合には gedit-devel をインストールしてください。
 
+
 %prep
 %setup -n gedit-%{version} -q
 
+
 %build
-%configure \
-    --disable-schemas-install \
-    --disable-spell \
-    --disable-updater \
-    --enable-attr
-make %{?_smp_mflags}
+%meson
+%meson_build
+
 
 %install
 rm -rf $RPM_BUILD_ROOT
+%meson_install
 
-make DESTDIR=$RPM_BUILD_ROOT install
-
-desktop-file-install --delete-original       \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications             \
-  --add-only-show-in GNOME                                  \
-  $RPM_BUILD_ROOT%{_datadir}/applications/*
-
-## clean up all the static libs for plugins (workaround for no -module)
-/bin/rm -f `find $RPM_BUILD_ROOT%{_libdir}/%{name}/plugin-loaders -name "*.la"`
-/bin/rm -f `find $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins -name "*.la"`
-/bin/rm -f `find $RPM_BUILD_ROOT%{_libdir} -name "*.la"`
+%find_lang %{name} --with-gnome
 
-## clean up unpackage files
-#/bin/rm -rf $RPM_BUILD_ROOT%{_includedir}/gedit-2.20
-/bin/rm -rf $RPM_BUILD_ROOT%{_datadir}/gtk-doc/html/gedit
-
-/bin/rm -rf $RPM_BUILD_ROOT%{_libexecdir}/gedit
-
-%find_lang %{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
 %post
 update-desktop-database %{_datadir}/applications >& /dev/null ||:
 
@@ -138,73 +114,38 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor >& /dev/null || :
 glib-compile-schemas %{_datadir}/glib-2.0/schemas >& /dev/null ||:
 gtk-update-icon-cache %{_datadir}/icons/hicolor >& /dev/null || :
 
-%postun python3-plugins
-glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
-
-%posttrans python3-plugins
-glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
-
 
 %files -f %{name}.lang
 %defattr(-, root, root)
-%doc AUTHORS COPYING ChangeLog NEWS README
+%license COPYING
+%doc NEWS README*
 %{_bindir}/gedit
-%{_bindir}/gnome-text-editor
-%{_libdir}/%{name}/libgedit.so
-%{_libdir}/%{name}/girepository-1.0/*.typelib
-%dir %{_libdir}/%{name}/plugins
-%{_libdir}/gedit/plugins/docinfo.plugin
-%{_libdir}/gedit/plugins/filebrowser.plugin
-%{_libdir}/gedit/plugins/libdocinfo.so
-%{_libdir}/gedit/plugins/libfilebrowser.so
-%{_libdir}/gedit/plugins/libmodelines.so
-%{_libdir}/gedit/plugins/libsort.so
-%{_libdir}/gedit/plugins/libtime.so
-%{_libdir}/gedit/plugins/modelines.plugin
-%{_libdir}/gedit/plugins/sort.plugin
-%{_libdir}/gedit/plugins/time.plugin
-%{_datadir}/GConf/gsettings/gedit.convert
-%{_datadir}/appdata/org.gnome.gedit.appdata.xml
+%{_libdir}/%{name}
+%{python3_sitearch}/gi/overrides/Gedit.*
 %{_datadir}/applications/org.gnome.gedit.desktop
+%{_datadir}/metainfo/org.gnome.gedit.appdata.xml
 %{_datadir}/dbus-1/services/org.gnome.gedit.service
 %dir %{_datadir}/%{name}/plugins
-%{_datadir}/gedit/plugins/modelines
-%{_datadir}/glib-2.0/schemas/org.gnome.gedit.enums.xml
-%{_datadir}/glib-2.0/schemas/org.gnome.gedit.gschema.xml
-%{_datadir}/glib-2.0/schemas/org.gnome.gedit.plugins.filebrowser.enums.xml
-%{_datadir}/glib-2.0/schemas/org.gnome.gedit.plugins.filebrowser.gschema.xml
-%{_datadir}/glib-2.0/schemas/org.gnome.gedit.plugins.time.enums.xml
-%{_datadir}/glib-2.0/schemas/org.gnome.gedit.plugins.time.gschema.xml
-%{_datadir}/help/*/%{name}
+%{_datadir}/%{name}/plugins/*
+%{_datadir}/glib-2.0/schemas/*
 %{_datadir}/icons/*/*/*/*
 %{_mandir}/man1/*
 
-%files python3-plugins
-%defattr(-, root, root)
-%{python3_sitearch}/gi/overrides/Gedit.*
-%{python3_sitearch}/gi/overrides/__pycache__/Gedit.cpython-*
-%{_libdir}/gedit/plugins/externaltools
-%{_libdir}/gedit/plugins/externaltools.plugin
-%{_libdir}/gedit/plugins/pythonconsole
-%{_libdir}/gedit/plugins/pythonconsole.plugin
-%{_libdir}/gedit/plugins/quickopen
-%{_libdir}/gedit/plugins/quickopen.plugin
-%{_libdir}/gedit/plugins/snippets
-%{_libdir}/gedit/plugins/snippets.plugin
-%{_datadir}/gedit/plugins/externaltools
-%{_datadir}/gedit/plugins/pythonconsole
-%{_datadir}/gedit/plugins/snippets
-%{_datadir}/glib-2.0/schemas/org.gnome.gedit.plugins.externaltools.gschema.xml
-%{_datadir}/glib-2.0/schemas/org.gnome.gedit.plugins.pythonconsole.gschema.xml
-
-
 %files devel
 %defattr(-, root, root)
-%{_includedir}/%{name}-3.14
+%{_includedir}/%{name}-3.36
 %{_libdir}/pkgconfig/*.pc
 %{_datadir}/%{name}/gir-1.0/*.gir
+%dir %{_datadir}/vala
+%dir %{_datadir}/vala/vapi
+%{_datadir}/vala/vapi/*
+
 
 %changelog
+* Sun Aug 09 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.36.2-1
+- new upstream release.
+- unified gedit-python3-plugins into main package.
+
 * Sun Jul 17 2016 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.20.2-1
 - new upstream release
 

t/tepl/tepl-vl.spec

@@ -0,0 +1,113 @@
+Summary:        Text editor product line
+Name:           tepl
+Version:        4.4.0
+Release:        2%{?_dist_release}
+Group:          system
+Vendor:         Project Vine
+Distribution:   Vine Linux
+
+License:        LGPLv2+
+URL:            https://wiki.gnome.org/Projects/Tepl
+%global         shortver %(echo %{version} | cut -d . -f 1,2)
+Source0:        https://download.gnome.org/sources/%{name}/%{shortver}/%{name}-%{version}.tar.xz
+
+BuildRequires:  gcc
+BuildRequires:  gettext
+BuildRequires:  pkgconfig(amtk-5)
+BuildRequires:  pkgconfig(glib-2.0)
+BuildRequires:  pkgconfig(gobject-introspection-1.0)
+BuildRequires:  pkgconfig(gtk+-3.0)
+BuildRequires:  pkgconfig(gtksourceview-4)
+BuildRequires:  pkgconfig(libxml-2.0)
+BuildRequires:  pkgconfig(uchardet)
+
+%description
+Tepl is a library that eases the development of GtkSourceView-based text
+editors and IDEs. Tepl is the acronym for “Text editor product line”.
+
+
+%package        devel
+Summary:        Development files for %{name}
+Group:          programming
+Requires:       %{name}%{?_isa} = %{version}-%{release}
+Obsoletes:      gtef-devel < 3.0.0
+
+%description    devel
+The %{name}-devel package contains libraries and header files for
+developing applications that use %{name}.
+
+
+%prep
+%autosetup
+
+
+%build
+%configure
+%make_build V=1
+
+
+%install
+%make_install
+find $RPM_BUILD_ROOT -name '*.la' -delete
+
+%find_lang tepl-4
+
+
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
+
+
+%files -f tepl-4.lang
+%license COPYING
+%doc AUTHORS NEWS README
+%dir %{_libdir}/girepository-1.0
+%{_libdir}/girepository-1.0/Tepl-4.typelib
+%{_libdir}/libtepl-4.so.0*
+
+%files devel
+%{_includedir}/tepl-4/
+%{_libdir}/libtepl-4.so
+%{_libdir}/pkgconfig/tepl-4.pc
+%dir %{_datadir}/gir-1.0
+%{_datadir}/gir-1.0/Tepl-4.gir
+%dir %{_datadir}/gtk-doc
+%dir %{_datadir}/gtk-doc/html
+%{_datadir}/gtk-doc/html/tepl-4.0/
+
+
+%changelog
+* Sat Aug 08 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 4.4.0-2
+- initial build for Vine Linux.
+
+* Thu Mar 05 2020 Kalev Lember <klember@redhat.com> - 4.4.0-1
+- Update to 4.4.0
+
+* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.3.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Mon Dec 02 2019 Kalev Lember <klember@redhat.com> - 4.3.1-1
+- Update to 4.3.1
+
+* Wed Nov 27 2019 Kalev Lember <klember@redhat.com> - 4.2.1-1
+- Update to 4.2.1
+
+* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4.2.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Mon Mar 11 2019 Phil Wyett <philwyett@kathenas.org> - 4.2.0-1
+- Update to 4.2.0
+
+* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.0-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Sat Aug 04 2018 Kalev Lember <klember@redhat.com> - 3.0.0-4
+- Obsolete gtef (#1612444)
+
+* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Sun Oct 29 2017 Kalev Lember <klember@redhat.com> - 3.0.0-1
+- Initial Fedora packaging

u/uchardet/uchardet-vl.spec

@@ -0,0 +1,162 @@
+%undefine __cmake_in_source_build
+
+Name:           uchardet
+Version:        0.0.6
+Release:        12%{?_dist_release}
+Summary:        An encoding detector library ported from Mozilla
+Group:          system
+Vendor:         Project Vine
+Distribution:   Vine Linux
+
+License:        MPLv1.1
+URL:            https://www.freedesktop.org/wiki/Software/%{name}
+Source0:        https://www.freedesktop.org/software/%{name}/releases/%{name}-%{version}.tar.xz
+
+BuildRequires:  gcc
+BuildRequires:  gcc-c++
+BuildRequires:  cmake
+
+%description
+Uchardet is a C language binding of the original C++ implementation of the
+universal charset detection library by Mozilla. Uchardet is an encoding
+detector library, which takes a sequence of bytes in an unknown character
+encoding without any additional information, and attempts to determine the
+encoding of the text.
+
+%package        devel
+Summary:        Development files for %{name}
+Group:          programming
+Requires:       %{name}%{?_isa} = %{version}-%{release}
+
+%description    devel
+The %{name}-devel package contains headers and shared libraries
+for developing tools for uchardet.
+
+
+%prep
+%autosetup
+
+
+%build
+mkdir -p build
+pushd build
+%cmake \
+  -DCMAKE_INSTALL_LIBDIR=%{_libdir} \
+  -DBUILD_STATIC=OFF \
+  ..
+make %{?_smp_mflags}
+popd
+
+
+%install
+pushd build
+make DESTDIR=%{buildroot} install
+popd
+
+
+%check
+pushd build
+  ctest -VV \
+  %ifarch %{ix86}
+    || :
+  %else
+    ;
+  %endif
+popd
+
+
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
+
+
+%files
+%license COPYING
+%doc AUTHORS
+%{_bindir}/%{name}
+%{_libdir}/lib%{name}.so.*
+%{_mandir}/man1/%{name}.1*
+
+%files devel
+%{_includedir}/%{name}/
+%{_libdir}/lib%{name}.so
+%{_libdir}/pkgconfig/%{name}.pc
+
+
+%changelog
+* Sat Aug 08 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 0.0.6-12
+- initial build for Vine Linux.
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.6-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.6-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.6-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.6-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.6-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.6-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Sat Feb 03 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.0.6-5
+- Switch to %%ldconfig_scriptlets
+
+* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.6-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.6-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.6-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Thu Dec 22 2016 Ilya Gradina <ilya.gradina@gmail.com> - 0.0.6-1
+- update version to 0.0.6
+- changed upstream url
+
+* Thu Jul 07 2016 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 0.0.5-4
+- Rebuild for f23 to fix i686
+
+* Fri Feb 12 2016 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 0.0.5-3
+- Fixup summary in devel subpkg
+
+* Mon Feb 08 2016 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 0.0.5-2
+- Fix building on i686 properly
+
+* Sat Feb 6  2016 Ilya Gradina <ilya.gradina@gmail.com> - 0.0.5-1
+- update version to 0.0.5
+
+* Fri Nov 20 2015 Ilya Gradina <ilya.gradina@gmail.com> - 0.0.3-1
+- update version to 0.0.3
+- add tests
+
+* Thu Oct  1 2015 Ilya Gradina <ilya.gradina@gmail.com> - 0.0.1-5
+- remove macros srcname and sum
+
+* Mon Sep 21 2015 Ilya Gradina <ilya.gradina@gmail.com> - 0.0.1-4
+- fix enable debug packages
+- fix add flag verbose for make
+- fix change in build
+- fix remove in libs from files
+- fix add change for libs in post/postun
+- fix version on 0.0.1 from git
+- added macros
+
+* Mon Sep 21 2015 Ilya Gradina <ilya.gradina@gmail.com> - 0.0.0-3
+- fix description and summary for libs and libs-devel
+
+* Mon Sep 21 2015 Ilya Gradina <ilya.gradina@gmail.com> - 0.0.0-2
+- fix version on 0.0.0
+- fix license path
+- remove static lib
+- fix description
+- fix number packages
+
+* Mon Sep 21 2015 Ilya Gradina <ilya.gradina@gmail.com> - 0.0.0-1
+- Initial package