rpms/setools
7
0
Fork 0
Code Issues Pull Requests Releases Activity

put libraries in %{_libdir}, not hardcoded /usr/lib

Browse Source
This commit is contained in:
Bill Nottingham 2005-05-23 18:59:57 +00:00
parent 1d439ede7f
commit 17ff598422
2 changed files with 50 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
setools-rhat.patch
View File

@ -113,3 +113,23 @@
install -m 644 $(GLADE_FILES) $(INSTALL_LIBDIR) install -m 644 $(GLADE_FILES) $(INSTALL_LIBDIR)
install -m 644 seaudit_help.txt $(INSTALL_LIBDIR) install -m 644 seaudit_help.txt $(INSTALL_LIBDIR)
install -m 444 dot_seaudit $(INSTALL_LIBDIR) install -m 444 dot_seaudit $(INSTALL_LIBDIR)
--- setools-2.1.0/Makefile.foo 2005-05-23 14:53:49.000000000 -0400
+++ setools-2.1.0/Makefile 2005-05-23 14:54:17.000000000 -0400
@@ -26,7 +26,7 @@
TCLVER = $(shell env tclsh tcl_vars)
#TCLVER = 8.3
#TCL_INCLUDE = -I/usr/include
-#TCL_LIBINC = -L/usr/lib
+#TCL_LIBINC = -L$(LIBDIR)
TCL_LIBS = -ltk$(TCLVER) -ltcl$(TCLVER) -ldl $(LIBS)
INCLUDE_DIR = $(DESTDIR)/usr/include
@@ -35,7 +35,7 @@
YACC = bison -y
LEX = flex -olex.yy.c
-SHARED_LIB_INSTALL_DIR = $(DESTDIR)/usr/lib
+SHARED_LIB_INSTALL_DIR = $(DESTDIR)$(LIBDIR)
STATIC_LIB_INSTALL_DIR = $(SHARED_LIB_INSTALL_DIR)
SETOOLS_INCLUDE = $(INCLUDE_DIR)/setools

56
setools.spec
View File

@ -1,7 +1,7 @@
Summary: SELinux tools for managing policy Summary: SELinux tools for managing policy
Name: setools Name: setools
Version: 2.1.0 Version: 2.1.0
Release: 4 Release: 5
License: GPL License: GPL
Group: System Environment/Base Group: System Environment/Base
Source: http://www.tresys.com/Downloads/selinux-tools/setools-%{version}.tar.bz2 Source: http://www.tresys.com/Downloads/selinux-tools/setools-%{version}.tar.bz2
@ -98,13 +98,13 @@ make LIBDIR=%{_libdir} all
%install %install
rm -rf ${RPM_BUILD_ROOT} rm -rf ${RPM_BUILD_ROOT}
mkdir -p $RPM_BUILD_ROOT/%_bindir mkdir -p $RPM_BUILD_ROOT/%{_bindir}
mkdir -p $RPM_BUILD_ROOT/%_sbindir mkdir -p $RPM_BUILD_ROOT/%{_sbindir}
mkdir -p $RPM_BUILD_ROOT/%_libdir mkdir -p $RPM_BUILD_ROOT/%_libdir
mkdir -p $RPM_BUILD_ROOT/usr/include/selinux/apol mkdir -p $RPM_BUILD_ROOT%{_includedir}/selinux/apol
mkdir -p $RPM_BUILD_ROOT/usr/share/doc/setools-%{version} mkdir -p $RPM_BUILD_ROOT/usr/share/doc/setools-%{version}
mkdir -p $RPM_BUILD_ROOT/usr/share/tcl8.4 mkdir -p $RPM_BUILD_ROOT/usr/share/tcl8.4
make DESTDIR="${RPM_BUILD_ROOT}" INSTALL_HELPDIR=$RPM_BUILD_ROOT/usr/share/doc/setools-%{version} install install-bwidget make DESTDIR="${RPM_BUILD_ROOT}" INSTALL_HELPDIR=$RPM_BUILD_ROOT/usr/share/doc/setools-%{version} LIBDIR=%{_libdir} install install-bwidget
rm -f ${RPM_BUILD_ROOT}/etc/selinux/strict/src/policy/domains/program/seuser.te rm -f ${RPM_BUILD_ROOT}/etc/selinux/strict/src/policy/domains/program/seuser.te
rm -f ${RPM_BUILD_ROOT}/etc/selinux/strict/src/policy/file_contexts/program/seuser.fc rm -f ${RPM_BUILD_ROOT}/etc/selinux/strict/src/policy/file_contexts/program/seuser.fc
rm -f ${RPM_BUILD_ROOT}/usr/bin/findcon rm -f ${RPM_BUILD_ROOT}/usr/bin/findcon
@ -124,7 +124,7 @@ install -D %{SOURCE6} ${RPM_BUILD_ROOT}%{_datadir}/applications/seuserx.desktop
install -D %{SOURCE7} ${RPM_BUILD_ROOT}%{_datadir}/applications/seaudit.desktop install -D %{SOURCE7} ${RPM_BUILD_ROOT}%{_datadir}/applications/seaudit.desktop
install -D %{SOURCE9} ${RPM_BUILD_ROOT}%{_datadir}/applications/sediffx.desktop install -D %{SOURCE9} ${RPM_BUILD_ROOT}%{_datadir}/applications/sediffx.desktop
install -D %{SOURCE11} ${RPM_BUILD_ROOT}%{_datadir}/applications/sediffx.desktop install -D %{SOURCE11} ${RPM_BUILD_ROOT}%{_datadir}/applications/sediffx.desktop
cd $RPM_BUILD_ROOT/%_bindir/ cd $RPM_BUILD_ROOT/%{_bindir}/
ln -sf consolehelper apol ln -sf consolehelper apol
ln -sf consolehelper seuserx ln -sf consolehelper seuserx
ln -sf consolehelper seaudit ln -sf consolehelper seaudit
@ -137,18 +137,18 @@ rm -rf ${RPM_BUILD_ROOT}
%defattr(-,root,root) %defattr(-,root,root)
%dir /usr/share/tcl8.4/BWidget-1.4.1 %dir /usr/share/tcl8.4/BWidget-1.4.1
/usr/share/tcl8.4/BWidget-1.4.1/* /usr/share/tcl8.4/BWidget-1.4.1/*
%_bindir/apol %{_bindir}/apol
%_sbindir/apol %{_sbindir}/apol
%_bindir/seuserx %{_bindir}/seuserx
%_sbindir/seuserx %{_sbindir}/seuserx
%_bindir/sediff %{_bindir}/sediff
%_sbindir/sediffx %{_sbindir}/sediffx
%_bindir/awish %{_bindir}/awish
%_bindir/seaudit %{_bindir}/seaudit
%_sbindir/seaudit %{_sbindir}/seaudit
%_sbindir/seaudit-report %{_sbindir}/seaudit-report
%_bindir/sepcut %{_bindir}/sepcut
%_sbindir/sepcut %{_sbindir}/sepcut
%{_datadir}/applications/apol.desktop %{_datadir}/applications/apol.desktop
%{_datadir}/applications/seuserx.desktop %{_datadir}/applications/seuserx.desktop
%{_datadir}/applications/seaudit.desktop %{_datadir}/applications/seaudit.desktop
@ -170,23 +170,27 @@ Requires: %{name} = %{version}-%{release}
Headers, static libraries and API docs for SETools. Headers, static libraries and API docs for SETools.
%files devel %files devel
/usr/include/setools %{_includedir}/setools
/usr/lib %{_libdir}
%files %files
%defattr(-,root,root) %defattr(-,root,root)
%_bindir/seuser %{_bindir}/seuser
%_bindir/seuseradd %{_bindir}/seuseradd
%_bindir/seuserdel %{_bindir}/seuserdel
%_bindir/seusermod %{_bindir}/seusermod
%_bindir/seinfo %{_bindir}/seinfo
%_bindir/sesearch %{_bindir}/sesearch
%dir /usr/share/setools %dir /usr/share/setools
/usr/share/setools/* /usr/share/setools/*
%dir /usr/share/doc/setools-%{version} %dir /usr/share/doc/setools-%{version}
/usr/share/doc/setools-%{version}/* /usr/share/doc/setools-%{version}/*
%changelog %changelog
* Mon May 23 2005 Bill Nottingham <notting@redhat.com> 2.1.0-5
- put libraries in the right place (also puts debuginfo in the right
package)
* Thu May 12 2005 Dan Walsh <dwalsh@redhat.com> 2.1.0-4 * Thu May 12 2005 Dan Walsh <dwalsh@redhat.com> 2.1.0-4
- Move sepcut to gui apps. - Move sepcut to gui apps.