From 1ffcab7c6d60dc9cf998a5be9350eb47d1346001f4991e887884584645a98a5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Fri, 30 Jan 2015 16:55:41 +0000 Subject: [PATCH 1/4] Add lost last char to the Summary OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/cifs-utils?expand=0&rev=127 --- cifs-utils.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cifs-utils.spec b/cifs-utils.spec index ba8d3bf..5cddf58 100644 --- a/cifs-utils.spec +++ b/cifs-utils.spec @@ -1,7 +1,7 @@ # # spec file for package cifs-utils # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 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 @@ -19,7 +19,7 @@ Name: cifs-utils Version: 6.4 Release: 0 -Summary: Utilities for doing and managing mounts of the Linux CIFS filesyste +Summary: Utilities for doing and managing mounts of the Linux CIFS filesystem License: GPL-3.0+ Group: System/Filesystems Url: http://www.samba.org/linux-cifs/cifs-utils/ From 315e4b130f18e162cfe10eeda65ac6ab1a2ef72ffd3e33ab97434a0bc4f745c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Fri, 20 Feb 2015 13:26:25 +0000 Subject: [PATCH 2/4] Replace ftp by http source location. OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/cifs-utils?expand=0&rev=128 --- cifs-utils.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cifs-utils.spec b/cifs-utils.spec index 5cddf58..59c1466 100644 --- a/cifs-utils.spec +++ b/cifs-utils.spec @@ -23,9 +23,9 @@ Summary: Utilities for doing and managing mounts of the Linux CIFS filesy License: GPL-3.0+ Group: System/Filesystems Url: http://www.samba.org/linux-cifs/cifs-utils/ -Source: ftp://ftp.samba.org/pub/linux-cifs/%{name}/%{name}-%{version}.tar.bz2 -Source5: ftp://ftp.samba.org/pub/linux-cifs/%{name}/%{name}-%{version}.tar.bz2.asc -# ftp://ftp.samba.org/pub/linux-cifs/cifs-utils/cifs-utils-pubkey_70F3B981.asc +Source: http://ftp.samba.org/pub/linux-cifs/%{name}/%{name}-%{version}.tar.bz2 +Source5: http://ftp.samba.org/pub/linux-cifs/%{name}/%{name}-%{version}.tar.bz2.asc +# http://ftp.samba.org/pub/linux-cifs/cifs-utils/cifs-utils-pubkey_70F3B981.asc Source6: cifs-utils.keyring Source100: README.cifstab.migration %if "%{_vendor}" == "suse" From dfc5d528d32525c6bc5f21ac6da71faccb93a14997c97b308c188e5f6d769e5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Wed, 6 May 2015 17:31:33 +0000 Subject: [PATCH 3/4] Drop redundant doc attribute from man pages. OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/cifs-utils?expand=0&rev=129 --- cifs-utils.spec | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/cifs-utils.spec b/cifs-utils.spec index 59c1466..a8db967 100644 --- a/cifs-utils.spec +++ b/cifs-utils.spec @@ -156,17 +156,17 @@ touch ${RPM_BUILD_ROOT}/%{_sysconfdir}/sysconfig/%{NET_CFGDIR}/if-{down,up}.d/${ %{_bindir}/getcifsacl %{_bindir}/setcifsacl %{_sbindir}/cifs.idmap -%doc %{_mandir}/man1/getcifsacl.1.* -%doc %{_mandir}/man1/setcifsacl.1.* -%doc %{_mandir}/man8/cifs.idmap.8.* +%{_mandir}/man1/getcifsacl.1.* +%{_mandir}/man1/setcifsacl.1.* +%{_mandir}/man8/cifs.idmap.8.* %endif %if 0%{?centos_version} > 499 || 0%{?fedora_version} > 14 || 0%{?mandriva_version} > 201100 || 0%{?rhel_version} > 499 || 0%{?suse_version} > 1020 %{_bindir}/cifscreds %{_sbindir}/cifs.upcall -%doc %{_mandir}/man1/cifscreds.1.* -%doc %{_mandir}/man8/cifs.upcall.8.* +%{_mandir}/man1/cifscreds.1.* +%{_mandir}/man8/cifs.upcall.8.* %endif -%doc %{_mandir}/man8/mount.cifs.8.* +%{_mandir}/man8/mount.cifs.8.* %dir %{_sysconfdir}/request-key.d %config(noreplace) %{_sysconfdir}/request-key.d/cifs.idmap.conf %config(noreplace) %{_sysconfdir}/request-key.d/cifs.spnego.conf @@ -175,7 +175,7 @@ touch ${RPM_BUILD_ROOT}/%{_sysconfdir}/sysconfig/%{NET_CFGDIR}/if-{down,up}.d/${ %dir %{_sysconfdir}/cifs-utils %config(noreplace) %{_sysconfdir}/cifs-utils/idmap-plugin %{_libdir}/%{name}/idmapwb.so -%doc %{_mandir}/man8/idmapwb.8.* +%{_mandir}/man8/idmapwb.8.* %endif %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1221 %attr(0754,root,root) %config %{_sysconfdir}/init.d/cifs From 180dd299cceea1bdaedebac0fc13c15de8a7d0fc03cf90fa74f586cef1cf1653 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Mon, 6 Jul 2015 14:29:58 +0000 Subject: [PATCH 4/4] Add include_paths.h_for__PATH_MOUNTED.patch OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/cifs-utils?expand=0&rev=130 --- cifs-utils.changes | 5 +++++ cifs-utils.spec | 2 ++ include_paths.h_for__PATH_MOUNTED.patch | 20 ++++++++++++++++++++ 3 files changed, 27 insertions(+) create mode 100644 include_paths.h_for__PATH_MOUNTED.patch diff --git a/cifs-utils.changes b/cifs-utils.changes index 6406e2e..a2e6028 100644 --- a/cifs-utils.changes +++ b/cifs-utils.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jul 6 14:23:59 UTC 2015 - lmuelle@suse.com + +- Add include_paths.h_for__PATH_MOUNTED.patch + ------------------------------------------------------------------- Wed Dec 3 13:37:48 UTC 2014 - bwiedemann@suse.com diff --git a/cifs-utils.spec b/cifs-utils.spec index a8db967..94a05ba 100644 --- a/cifs-utils.spec +++ b/cifs-utils.spec @@ -28,6 +28,7 @@ Source5: http://ftp.samba.org/pub/linux-cifs/%{name}/%{name}-%{version}.t # http://ftp.samba.org/pub/linux-cifs/cifs-utils/cifs-utils-pubkey_70F3B981.asc Source6: cifs-utils.keyring Source100: README.cifstab.migration +Patch: include_paths.h_for__PATH_MOUNTED.patch %if "%{_vendor}" == "suse" %define NET_CFGDIR network %else @@ -111,6 +112,7 @@ provide these credentials to the kernel automatically at login. %prep %setup -q +%patch -p1 cp -a ${RPM_SOURCE_DIR}/README.cifstab.migration . %build diff --git a/include_paths.h_for__PATH_MOUNTED.patch b/include_paths.h_for__PATH_MOUNTED.patch new file mode 100644 index 0000000..4872579 --- /dev/null +++ b/include_paths.h_for__PATH_MOUNTED.patch @@ -0,0 +1,20 @@ +commit 6603cef0f06c450196a1bca06bb143d8fcda5651 +Author: Felix Janda +Date: Fri Dec 5 23:19:29 2014 +0100 + + mtab.c: include for _PATH_MOUNTED + + Signed-off-by: Felix Janda + +diff --git a/mtab.c b/mtab.c +index 7b365b3..a662a3c 100644 +--- a/mtab.c ++++ b/mtab.c +@@ -38,6 +38,7 @@ + #include + #include + #include ++#include + #include "mount.h" + #include "config.h" +