Browse Source

updated 2 packages

autofs-5.1.7-1

libgnome-keyring-3.12.0-2
Tomohiro "Tomo-p" KATO 3 years ago
parent
commit
3b21ba2eff
2 changed files with 56 additions and 28 deletions
  1. 17 6
      a/autofs/autofs-vl.spec
  2. 39 22
      lib/libg/libgnome-keyring/libgnome-keyring-vl.spec

+ 17 - 6
a/autofs/autofs-vl.spec

@@ -1,10 +1,12 @@
+%bcond_with systemd
+
 Summary: A tool for automatically mounting and unmounting filesystems.
 Summary(ja): 自動的にファイルシステムをマウント/アンマウントするツール
 Name: autofs
-Version: 5.1.6
-Release: 1%{?_dist_release}
 Epoch: 1
-Group: System Environment/Daemons
+Version: 5.1.7
+Release: 1%{?_dist_release}%{?with_systemd:.systemd}
+Group: system
 Vendor: Project Vine
 Distribution: Vine Linux
 Packager: daisuke, kenta, shaolin
@@ -27,7 +29,6 @@ BuildRequires: rpcgen
 %if %{with systemd}
 BuildRequires: systemd-units
 BuildRequires: systemd-devel
-Requires(post): systemd-sysv
 Requires(post): systemd-units
 Requires(preun): systemd-units
 Requires(postun): systemd-units
@@ -65,6 +66,9 @@ automount デーモンは,ファイルシステムを使う時に自動的に
 すると良いでしょう.
 
 
+%debug_package
+
+
 %prep
 %setup -q
 echo %{version}-%{release} > .version
@@ -84,6 +88,7 @@ echo %{version}-%{release} > .version
 %endif
 %define unitdir %{?_unitdir:/lib/systemd/system}
 
+
 %build
 CFLAGS="$RPM_OPT_FLAGS -ggdb"; export CFLAGS
 %configure \
@@ -95,6 +100,7 @@ CFLAGS="$RPM_OPT_FLAGS -ggdb"; export CFLAGS
            --with-libtirpc %{?systemd_configure_arg:}
 make initdir=/etc/rc.d/init.d DONTSTRIP=1
 
+
 %install
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
 mkdir -p -m755 $RPM_BUILD_ROOT%{_initdir}
@@ -112,7 +118,7 @@ install -m 644 redhat/autofs.sysconfig $RPM_BUILD_ROOT/etc/sysconfig/autofs
 %if %{with systemd}
 # Configure can get this wrong when the unit files appear under /lib and /usr/lib
 find $RPM_BUILD_ROOT -type f -name autofs.service -exec rm -f {} \;
-install -m 644 redhat/autofs.service $RPM_BUILD_ROOT%{unitdir}/autofs.service
+install -Dpm 644 redhat/autofs.service $RPM_BUILD_ROOT%{unitdir}/autofs.service
 %define init_file_name %{unitdir}/autofs.service
 %else
 install -m 755 redhat/autofs.init $RPM_BUILD_ROOT/etc/rc.d/init.d/autofs
@@ -179,13 +185,18 @@ fi
 %dir /misc
 %dir %{_libdir}/autofs
 %{_libdir}/autofs/*.so
+%{_libdir}/libautofs.so
 %{_mandir}/*/*
 %dir /etc/auto.master.d
 
 
 %changelog
+* Thu Mar 04 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 5.1.7-1
+- updated to 5.1.7.
+- added systemd support (disabled as default).
+
 * Sat Apr 04 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 5.1.6-1
-- updated to 5.1.6
+- updated to 5.1.6.
 
 * Sun May 15 2016 Yoji TOYODA <bsyamato@sea.plala.or.jp> - 5.1.1-1
 - update to 5.1.1

+ 39 - 22
lib/libg/libgnome-keyring/libgnome-keyring-vl.spec

@@ -8,25 +8,27 @@
 Summary: Framework for managing passwords and other secrets
 Name: libgnome-keyring
 Version: 3.12.0
-Release: 1%{?_dist_release}
+Release: 2%{?_dist_release}
+Group: system
+Vendor: Project Vine
+Distribution: Vine Linux
+
 License: GPLv2+ and LGPLv2+
-Group: System Environment/Libraries
-Source: http://ftp.gnome.org/pub/GNOME/sources/%{name}/3.12/%{name}-%{version}.tar.xz
-URL: http://live.gnome.org/GnomeKeyring
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+URL: https://wiki.gnome.org/Projects/GnomeKeyring
+%global shortver %(echo %{vsrsion} | cut -d . -f 1-2)
+Source: https://download.gnome.org/sources/%{name}/%{shortver}/%{name}-%{version}.tar.xz
+# https://gitlab.gnome.org/GNOME/libgnome-keyring/commit/3766bcc482f9e02fb5f9c183e814833ad1fbf08a
+Patch0:  libgnome-keyring-vapi-build-fix.patch
 
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: dbus-devel >= %{dbus_version}
-BuildRequires: eggdbus-devel >= %{eggdbus_version}
 BuildRequires: libgcrypt-devel >= %{gcrypt_version}
 BuildRequires: gobject-introspection-devel
 BuildRequires: intltool
+BuildRequires: vala-tools vala-devel
 Conflicts: gnome-keyring < 2.29.4
 
-Vendor: Project Vine
-Distribution: Vine Linux
-Packager: Takemikaduchi
-
 %description
 gnome-keyring is a program that keep password and other secrets for
 users. The library libgnome-keyring is used by applications to integrate
@@ -72,40 +74,47 @@ The libgnome-keyring-devel package contains the libraries and
 header files needed to develop applications that use libgnome-keyring.
 
 
+%debug_package
+
+
 %prep
-%setup -q -n libgnome-keyring-%{version}
+%autosetup -p1
+
 
 %build
 %configure \
 	--disable-gtk-doc \
 	--enable-introspection
-
+# avoid unneeded direct dependencies
+sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' libtool
 
 make %{?_smp_mflags}
 
+
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
-rm $RPM_BUILD_ROOT%{_libdir}/*.la
+rm -rf %{buildroot}
+make install DESTDIR=%{buildroot}
+rm %{buildroot}%{_libdir}/*.la
 
 %find_lang libgnome-keyring
 
-%clean
-rm -rf $RPM_BUILD_ROOT
 
+%check
+make check
 
-%post -p /sbin/ldconfig
 
-%postun -p /sbin/ldconfig
+%clean
+rm -rf %{buildroot}
 
-%post -n compat32-%{name} -p /sbin/ldconfig
 
-%postun -n compat32-%{name} -p /sbin/ldconfig
+%ldconfig_scriptlets
+%ldconfig_scriptlets -n compat32-%{name}
 
 
 %files -f libgnome-keyring.lang
 %defattr(-, root, root, -)
-%doc AUTHORS NEWS README COPYING HACKING
+%license COPYING
+%doc AUTHORS NEWS README HACKING
 %{_libdir}/lib*.so.*
 %{_libdir}/girepository-1.0/GnomeKeyring-1.0.typelib
 
@@ -115,6 +124,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/*
 %{_includedir}/*
 %{_datadir}/gir-1.0/GnomeKeyring-1.0.gir
+%dir %{_datadir}/vala/
+%dir %{_datadir}/vala/vapi
+%{_datadir}/vala/vapi/*
 %doc %{_datadir}/gtk-doc/html/gnome-keyring/
 
 # compat32
@@ -128,7 +140,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/lib*.so
 %endif
 
+
 %changelog
+* Fri Mar 05 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 3.12.0-2
+- imported Patch0 from rawhide.
+- added vala support.
+
 * Sat Mar 29 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> - 3.12.0-1
 - new upstream release