[packages/nfs4-acl-tools-gui] - saving last version of nfs4-acl-tools GUI part - added system-libs patch to build with up to date
qboosh
qboosh at pld-linux.org
Tue Aug 28 17:26:57 CEST 2018
commit ae410aa5ae5eb5979cdecb9f66efb99071b8a6ae
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Tue Aug 28 17:29:41 2018 +0200
- saving last version of nfs4-acl-tools GUI part
- added system-libs patch to build with up to date nfs4-acl-tools library
...rlcpy.patch => nfs4-acl-tools-gui-strlcpy.patch | 0
nfs4-acl-tools-gui-system-libs.patch | 13 +++
nfs4-acl-tools-gui.spec | 51 ++++++++++++
nfs4-acl-tools.spec | 96 ----------------------
4 files changed, 64 insertions(+), 96 deletions(-)
---
diff --git a/nfs4-acl-tools-gui.spec b/nfs4-acl-tools-gui.spec
new file mode 100644
index 0000000..bab8aee
--- /dev/null
+++ b/nfs4-acl-tools-gui.spec
@@ -0,0 +1,51 @@
+Summary: GUI ACL utility for the Linux NFSv4 client
+Summary(pl.UTF-8): Graficzny interfejs użytkownika do ACL dla linuksowego klienta NFSv4
+Name: nfs4-acl-tools-gui
+Version: 0.3.4
+Release: 1
+License: BSD
+Group: X11/Applications
+Source0: http://linux-nfs.org/~bfields/nfs4-acl-tools/nfs4-acl-tools-%{version}.tar.gz
+# Source0-md5: b72a83514cae9c754e64c3b266142eec
+Patch0: %{name}-strlcpy.patch
+Patch1: %{name}-system-libs.patch
+URL: http://linux-nfs.org/
+BuildRequires: QtGui-devel >= 4.1.4
+BuildRequires: attr-devel
+BuildRequires: nfs4-acl-tools-devel >= %{version}
+BuildRequires: qt4-build >= 4.3.3-3
+BuildRequires: qt4-qmake >= 4.3.3-3
+BuildRequires: rpmbuild(macros) >= 1.167
+BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+
+%description
+GUI ACL utility for the Linux NFSv4 client.
+
+%description -l pl.UTF-8
+Graficzny interfejs użytkownika do ACL dla linuksowego klienta NFSv4.
+
+%prep
+%setup -q -n nfs4-acl-tools-%{version}
+%patch0 -p1
+%patch1 -p1
+
+%build
+cd GUI/nfs4-acl-editor
+qmake-qt4 \
+ QMAKE_CXX="%{__cxx}" \
+ QMAKE_CXXFLAGS_RELEASE="%{rpmcxxflags}" \
+ QMAKE_LFLAGS_RELEASE="%{rpmldflags}"
+%{__make}
+
+%install
+rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT%{_bindir}
+
+install GUI/nfs4-acl-editor/nfs4-acl-editor $RPM_BUILD_ROOT%{_bindir}
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/nfs4-acl-editor
diff --git a/nfs4-acl-tools.spec b/nfs4-acl-tools.spec
deleted file mode 100644
index 901e8ab..0000000
--- a/nfs4-acl-tools.spec
+++ /dev/null
@@ -1,96 +0,0 @@
-#
-# Conditional build:
-%bcond_without gui # Qt4-based ACL editor
-#
-Summary: Command line ACL utilities for the Linux NFSv4 client
-Summary(pl.UTF-8): Narzędzia linii poleceń do ACL dla linuksowego klienta NFSv4
-Name: nfs4-acl-tools
-Version: 0.3.4
-Release: 1
-License: BSD
-Group: Applications/System
-Source0: http://linux-nfs.org/~bfields/nfs4-acl-tools/%{name}-%{version}.tar.gz
-# Source0-md5: b72a83514cae9c754e64c3b266142eec
-Patch0: %{name}-strlcpy.patch
-URL: http://linux-nfs.org/
-BuildRequires: attr-devel
-BuildRequires: autoconf >= 2.50
-BuildRequires: automake
-BuildRequires: libtool >= 2:1.5
-%if %{with gui}
-BuildRequires: QtGui-devel >= 4.1.4
-BuildRequires: qt4-build >= 4.3.3-3
-BuildRequires: qt4-qmake >= 4.3.3-3
-BuildRequires: rpmbuild(macros) >= 1.167
-%endif
-BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-
-%description
-Command line ACL utilities for the Linux NFSv4 client.
-
-%description -l pl.UTF-8
-Narzędzia linii poleceń do ACL dla linuksowego klienta NFSv4.
-
-%package gui
-Summary: GUI ACL utility for the Linux NFSv4 client
-Summary(pl.UTF-8): Graficzny interfejs użytkownika do ACL dla linuksowego klienta NFSv4
-License: BSD
-Group: X11/Applications
-
-%description gui
-GUI ACL utility for the Linux NFSv4 client.
-
-%description gui -l pl.UTF-8
-Graficzny interfejs użytkownika do ACL dla linuksowego klienta NFSv4.
-
-%prep
-%setup -q
-%patch0 -p1
-
-%build
-%{__aclocal} -I m4
-%{__autoconf}
-%configure
-%{__make} \
- LIBTOOL="libtool --tag=CC" \
- OPTIMIZER="%{rpmcflags}"
-
-%if %{with gui}
-cd GUI/nfs4-acl-editor
-qmake-qt4 \
- QMAKE_CXX="%{__cxx}" \
- QMAKE_CXXFLAGS_RELEASE="%{rpmcxxflags}" \
- QMAKE_LFLAGS_RELEASE="%{rpmldflags}"
-%{__make}
-%endif
-
-%install
-rm -rf $RPM_BUILD_ROOT
-
-%{__make} install \
- DESTDIR=$RPM_BUILD_ROOT \
- INSTALL_MAN='install -m644 $(MAN_PAGES) $(MAN_DEST)'
-
-%if %{with gui}
-install GUI/nfs4-acl-editor/nfs4-acl-editor $RPM_BUILD_ROOT%{_bindir}
-%endif
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%files
-%defattr(644,root,root,755)
-%doc COPYING README TODO
-%attr(755,root,root) %{_bindir}/nfs4_editfacl
-%attr(755,root,root) %{_bindir}/nfs4_getfacl
-%attr(755,root,root) %{_bindir}/nfs4_setfacl
-%{_mandir}/man1/nfs4_editfacl.1*
-%{_mandir}/man1/nfs4_getfacl.1*
-%{_mandir}/man1/nfs4_setfacl.1*
-%{_mandir}/man5/nfs4_acl.5*
-
-%if %{with gui}
-%files gui
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/nfs4-acl-editor
-%endif
diff --git a/nfs4-acl-tools-strlcpy.patch b/nfs4-acl-tools-gui-strlcpy.patch
similarity index 100%
rename from nfs4-acl-tools-strlcpy.patch
rename to nfs4-acl-tools-gui-strlcpy.patch
diff --git a/nfs4-acl-tools-gui-system-libs.patch b/nfs4-acl-tools-gui-system-libs.patch
new file mode 100644
index 0000000..d8a27fa
--- /dev/null
+++ b/nfs4-acl-tools-gui-system-libs.patch
@@ -0,0 +1,13 @@
+--- nfs4-acl-tools-0.3.4/GUI/nfs4-acl-editor/nfs4-acl-editor.pro.orig 2018-08-03 17:51:48.000000000 +0200
++++ nfs4-acl-tools-0.3.4/GUI/nfs4-acl-editor/nfs4-acl-editor.pro 2018-08-28 17:15:36.554959852 +0200
+@@ -6,9 +6,7 @@
+ TARGET +=
+ DEPENDPATH += .
+ INCLUDEPATH += .
+-INCLUDEPATH += /usr/local/include
+-INCLUDEPATH += ../../include
+-LIBS += ../../libnfs4acl/libnfs4acl.a
++LIBS += -lnfs4acl
+ LIBS += -lattr
+ #LIBS += /lib/libnfs4acl.a
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/nfs4-acl-tools-gui.git/commitdiff/ae410aa5ae5eb5979cdecb9f66efb99071b8a6ae
More information about the pld-cvs-commit
mailing list