Browse Source

updated 2 packages

blueman-2.1.4-1

libass-0.15.0-1
Tomohiro "Tomo-p" KATO 3 years ago
parent
commit
32352e5ecf
2 changed files with 96 additions and 78 deletions
  1. 86 71
      b/blueman/blueman-vl.spec
  2. 10 7
      lib/liba/libass/libass-vl.spec

+ 86 - 71
b/blueman/blueman-vl.spec

@@ -1,52 +1,43 @@
+%bcond_with systemd
+
 Summary: 	Full featured bluetooth manager for GNOME/GTK
 Summary(ja): 	GNOME/GTK 用の高機能な Bluetooth マネージャ
-
 Name: 		blueman
-Version: 	2.0.4
-Release: 	1%{?_dist_release}
-License: 	GPLv2+
-Group: 		Applications/System
-Url: 		https://github.com/blueman-project/blueman
+Version: 	2.1.4
+Release: 	1%{?_dist_release}%{?with_systemd:.systemd}
+Group: 		system
+Vendor:		Project Vine
+Distribution:	Vine Linux
+Packager:	daisuke
 
-Source0: 	https://github.com/blueman-project/blueman/releases/download/2.0/%{name}-%{version}.tar.xz
+License: 	GPLv2+
+URL: 		https://github.com/blueman-project/blueman
+Source0: 	https://github.com/blueman-project/blueman/releases/download/%{version}/%{name}-%{version}.tar.xz
 
 Buildroot: 	%{_tmppath}/%{name}-%{version}
+BuildRequires:	bluez-libs-devel >= 4.37
 BuildRequires:  desktop-file-utils
-BuildRequires:  perl(XML::Parser)
+BuildRequires:  gdk-pixbuf2-devel
 BuildRequires:  glib2-devel
-BuildRequires:  gtk2-devel
-BuildRequires:  pygtk2-devel
-BuildRequires:  polkit-devel
+BuildRequires:  gtk3-devel
 BuildRequires:  intltool
-BuildRequires:	startup-notification-devel
+BuildRequires:  libappindicator-devel
+BuildRequires:	NetworkManager-libnm-devel
+BuildRequires:  polkit-devel
 BuildRequires:	pygobject3-devel
-BuildRequires:	Cython
-BuildRequires:	notify-python
-BuildRequires:	bluez-libs-devel >= 4.37
-BuildRequires:	python-devel
-BuildRequires:	python-pyrex
-BuildRequires:	dbus-python
+BuildRequires:	python3-Cython
+BuildRequires:	python3-dbus
+BuildRequires:	python3-devel
+BuildRequires:	python3-pycairo-devel
 Requires:	bluez
 Requires:	obex-data-server
-Requires:	notify-python
-Requires:	pygtk2
-Requires:	dbus-python
-Requires:	pygobject3
-Requires:	Cython
+Requires:	python3-dbus
+Requires:	python3-pygobject
 Requires:	polkit
-Requires(postun,posttrans): glib2
-Requires(post,postun): desktop-file-utils
-Requires(post,postun): gtk2
 
 Provides:       dbus-bluez-pin-helper
-
 Obsoletes: 	bluez-gnome < 1.9
 
-Vendor: Project Vine
-Distribution: Vine Linux
-Packager: daisuke
-
-
 %description
 Blueman is designed to provide simple, yet effective means for 
 controlling BlueZ API and simplifying bluetooth tasks such as:
@@ -61,76 +52,100 @@ controlling BlueZ API and simplifying bluetooth tasks such as:
 Blueman also integrates with Network Manager 0.7, so any Dialup/Network
  connections will be made available (via HAL) to Network Manager.
 
+
+%debug_package
+
+
 %prep
 %setup -q
+sed -e 's|/usr/sbin/bluetoothd|%{_libexecdir}/bluetooth/bluetoothd|g' -i apps/blueman-report.in
+
 
 %build
-%configure --disable-desktop-update --disable-icon-update --disable-schemas-install
-%__make %{?_smp_mflags}
+export PYTHON=%{_bindir}/python3
+
+# Override the "_configure" macro - the name of the script
+# in this repo is ./autogen.sh, not ./configure
+%global _configure ./autogen.sh
+%configure \
+	--disable-static \
+	--enable-thunar-sendto=no \
+	--disable-schemas-compile
+%make_build
+
 
 %install
 rm -rf %{buildroot}
-%__make install DESTDIR=${RPM_BUILD_ROOT}
+%{make_install}
 
-desktop-file-install --vendor="" \
-  --add-category="GNOME;GTK" \
-  --add-category="Settings;HardwareSettings" \
-  --dir %{buildroot}%{_datadir}/applications %{buildroot}%{_datadir}/applications/%{name}-manager.desktop
+find %{buildroot} -name '*.la' -exec rm -f {} ';'
+rm -rf %{buildroot}%{_datadir}/doc/blueman/
 
-find $RPM_BUILD_ROOT -name '*.a' -exec rm -f {} \;
-find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} \;
+%find_lang blueman
 
-rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}
+# we need to own this, not only because of SELinux
+mkdir -p %{buildroot}/var/lib/blueman
+touch %{buildroot}/var/lib/blueman/network.state
+
+%if !%{with systemd}
+rm -rf %{buildroot}/usr/lib/systemd
+%endif
 
-%find_lang %{name}
 
 %clean
 rm -rf %{buildroot}
 
+
+%if %{with systemd}
 %post
-update-desktop-database %{_datadir}/applications >& /dev/null || :
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x /usr/bin/gtk-update-icon-cache ]; then
-  /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor ||:
-fi
-  
+%systemd_post blueman-mechanism.service
+%systemd_user_post blueman-applet.service
+
 %postun
-update-desktop-database %{_datadir}/applications >& /dev/null || :
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x /usr/bin/gtk-update-icon-cache ]; then
-  /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor ||:
-fi
-glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
+%systemd_postun_with_restart blueman-mechanism.service
 
-%posttrans
-glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
+%preun
+%systemd_preun blueman-mechanism.service
+%systemd_user_preun blueman-applet.service
+%endif
 
 
 %files -f %{name}.lang
-%doc CHANGELOG.md COPYING FAQ README.md
+%license COPYING
+%doc CHANGELOG.md FAQ README.md
 %defattr(-,root,root)
-%{_sysconfdir}/dbus-1/system.d/org.%{name}*.conf
+%{_bindir}/*
+%{_libexecdir}/%{name}-*
+%config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.%{name}*.conf
 %{_sysconfdir}/xdg/autostart/%{name}.desktop
-%{_bindir}/%{name}-*
-%{_datadir}/Thunar/sendto/thunar-sendto-%{name}.desktop
-%{_datadir}/applications/%{name}-adapters.desktop
-%{_datadir}/applications/%{name}-manager.desktop
-%{_datadir}/%{name}/ui/*.ui
-%{_datadir}/dbus-1/services/%{name}-applet.service
-%{_datadir}/dbus-1/system-services/org.%{name}*.service
-%{_datadir}/glib-2.0/schemas/org.%{name}.gschema.xml
+%{_datadir}/applications/%{name}-*.desktop
 %{_datadir}/icons/hicolor/*/*/*
 %{_datadir}/pixmaps/%{name}
+%{_datadir}/%{name}
+%{_datadir}/dbus-1/services/*.service
+%{_datadir}/dbus-1/system-services/*.service
+%{_datadir}/glib-2.0/schemas/*
 %{_datadir}/polkit-1/actions/org.%{name}.policy
+%{_datadir}/polkit-1/rules.d/%{name}.rules
 %{_mandir}/man1/%{name}*1.*
-%{python_sitelib}/*
-%if %_lib == lib64
-%{python_sitearch}/*
+%{python3_sitelib}/*
+%if "%_lib" == "lib64"
+%{python3_sitearch}/*
+%endif
+%dir /var/lib/blueman
+%ghost %attr(0644,root,root) /var/lib/blueman/network.state
+%if %{with systemd}
+%{_unitdir}/blueman-mechanism.service
+%{_userunitdir}/blueman-applet.service
 %endif
-%{_libexecdir}/%{name}-*
 
 
 %changelog
+* Tue Mar 09 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.1.4-1
+- new upstream release.
+- dropped scriptlets.
+- added systemd support (disabled as default).
+
 * Wed Jun 15 2016 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.0.4-1
 - new upstream release
 

+ 10 - 7
lib/liba/libass/libass-vl.spec

@@ -1,9 +1,9 @@
 Name:           libass
 Summary(ja):    SSA/ASS 字幕レンダリングのためのライブラリ
 Summary:        Portable library for SSA/ASS subtitles rendering
-Version:        0.14.0
+Version:        0.15.0
 Release:        1%{?_dist_release}
-Group:          System Environment/Libraries
+Group:          system
 Vendor:         Project Vine
 Distribution:   Vine Linux
 
@@ -34,9 +34,13 @@ The %{name}-devel package contains libraries and header files for
 developing applications that use %{name}.
 
 
+%debug_package
+
+
 %prep
 %setup -q
 
+
 %build
 %configure --disable-static
 %__make %{?_smp_mflags}
@@ -52,11 +56,6 @@ find $RPM_BUILD_ROOT -name '*.la' -exec %__rm -f {} ';'
 %__rm -rf $RPM_BUILD_ROOT
 
 
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
-
-
 %files
 %defattr(-,root,root,-)
 %license COPYING
@@ -70,6 +69,10 @@ find $RPM_BUILD_ROOT -name '*.la' -exec %__rm -f {} ';'
 %{_libdir}/pkgconfig/libass.pc
 
 %changelog
+* Tue Mar 09 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 0.15.0-1
+- new upstream release.
+- dropped scriptlets.
+
 * Mon May 18 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 0.14.0-1
 - new upstream release.