From dd7335726e416447c3167d0335a080730c4f7698 Mon Sep 17 00:00:00 2001
From: Daniel J Walsh <dwalsh@fedoraproject.org>
Date: Tue, 11 Apr 2006 13:34:08 +0000
Subject: [PATCH] *** empty log message ***

---
 apol.desktop    |   2 +-
 apol.png        | Bin 0 -> 1447 bytes
 seaudit.desktop |   2 +-
 seaudit.png     | Bin 0 -> 1330 bytes
 sediffx.desktop |   1 +
 sediffx.png     | Bin 0 -> 1414 bytes
 setools.spec    |  21 +++++++++++++++++++--
 7 files changed, 22 insertions(+), 4 deletions(-)
 create mode 100644 apol.png
 create mode 100644 seaudit.png
 create mode 100644 sediffx.png

diff --git a/apol.desktop b/apol.desktop
index 3f41557..5861642 100644
--- a/apol.desktop
+++ b/apol.desktop
@@ -2,7 +2,7 @@
 Name=SELinux Policy Analysis
 GenericName=SELinux Policy Analysis Tool 
 Comment=This tool can examine, search, and relate policy components and policy rules 
-#Icon=/usr/share/pixmaps/apol.xpm
+Icon=apol.png
 Exec=/usr/bin/apol
 Type=Application
 Terminal=false
diff --git a/apol.png b/apol.png
new file mode 100644
index 0000000000000000000000000000000000000000..68ffcb77bd9f8cd01043f566e539ce2f8c4820f6
GIT binary patch
literal 1447
zcmV;Y1z7rtP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00004XF*Lt007q5
z)K6G40000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU%IY~r8RCwC7
zR$WY!XB2+=WB-A#HbP;7)#7Gl*6RG3GW?0MJH|pB%YtSd%i=QKa7*09k}Y`Qg-etK
z<Hf=S>PVJsOZ-7%HUs`q)GkV)6QisMGAY<rT1u(y*ZS^!A8prW*|Hno<mvb3`_6lw
z_dVx1@2P|_h8H@r2uuV!p`CD<aDc!O`b$eo1*3<lZ}yb!{~8j3Kq8U!o0jNo+qM*8
z>sBL7Wm=p({Rd8Uj0E%Z^Es!}iEucK8#ivCudfddhXdo|<3U<~g>W_Xbp00r3%D0z
z!NP6u4o$-Mz>8<zCjcM8iEDtO>|Go`etdp`L?U8lW+p?{+uIAb+Z{}iqzSL&5O~f5
z!~F)VT(<xkxgUvW0`h#oF$nBGT8f^Y9_aP@3_&)8ArPjBaQ*sq0RrLD41uc+hy+!z
ztk*zosz>DBd3c=@kePwcTPf&k_F~_@eNZSAP^;A<R4P@@snTS^v$(hzp-^b4JRK`(
zj6xxO29_*<OjCk9R6*VIGwu#2QMMSOW2I6l+D=bTBM=BcDwRT`(TEVfX|-C>`QYH7
z;Cz%!M>7N}9w=E01l&`QMoxj-GXX^?iQ$xd%zNXAL?Rid*+U@Yd0w2G&1Nw~G|mb?
z83NB78QuYmwA-gYdBBB$@OF}M9`Km*vyS4g)9Er!W3d=+-n=Q!tE#HR-3uWTPTJYo
ziBz&Pb-?bQ0qgl1%zq1P^gFQN_cZSVJAD|;VzDrn%f%>x?81c$tfr<$Sd;_d9VMA1
z5{dLXF6RU>%DKuw+a<ko)^bE2KSIPE$Kpk#5br%vMK+ra4Gj%q0zdim02VD@FYa0%
z^`W=tB6jcIjbq1-Atl#f4ndMal#I?nt~Enz*$<iOJe~|+MTsVfhF!qO$OyW+x<u!1
zfA}R>$!mx!REY8k%*vKwOM?}Kh3%-Tt3$d5atPE(K))=B*@t7K|7*B)DFW~9B&Zy4
zXM~csiAQ&LH$HAU2*r}u@mY-p22$x+s>i@=0z=MWRPSm;TU*=T@fXyYp3Fq)M*+-E
zB{23&C!XH91&+iLCUGbUY0VqU*C5Ya3@zEt5cw=^Os<q;^#&>!wE=mC5~RbEL!e)!
zz{qW2AxSkp&Eu8zz}h{)B2tpW%VFovouXYKh3uI`h7;q!$q8VN2xL@W8l?>7g=$Fn
z*&GRH2om8q<T@3kGN5>q6vmang6BX11(D-8R904sNuC@VhROFkw23H`v|2&VC2<}V
z(g+^79O9LcodapMilj0IX+jTf^%s!K%i#NsVqXAkST>5*)>bq%HKC)U1LgS=Y@YLA
zUGxz)!jCGs54>*_K4&+|m7>f3f5=q0Ds+k%p7VK-$W-v?w&0t|A5c4%L;*K%W4GHe
zFff4n`g$}rHlnDgNVpO(H8q9hvMBZ|M)6MFDzsc0vK{gBLQmPAA&Aq-OqHYvmmiNp
z?RfL-Qv_p4lv79_+y`E=&fB%Lw4k=O7U#~L6ICS;2)FD>XCLezZA8(MLfEY#<PA;O
zj!ecc%bJ^;ap=$?Qy>JJg?6ehrKI+S@nblF56I~zs=bR&su2Z;6)RT2XrzW@GGWJ#
z9b!%@Dk|XdcrbAH9^8NW@rFhYKJLfMdf?YF-k82BIGqyx-@ZS8RdgK%JNy;cdvAf2
zm5608w91xLY?;++WpoNwU0ux#1_MjASfP!!Z&pc}<5dMaXpk_`KC36&gp0AP7}@>z
zK<a(=5Hhlj(EKm`xg|v?tmh;z`d@_<FL?YVzyL`*Eg|w=e%t^6002ovPDHLkV1i(f
BqVWI#

literal 0
HcmV?d00001

diff --git a/seaudit.desktop b/seaudit.desktop
index dad401d..20ca444 100644
--- a/seaudit.desktop
+++ b/seaudit.desktop
@@ -2,7 +2,7 @@
 Name=SELinux Audit Log Analysis
 GenericName=SELinux Audit Log Analysis Tool
 Comment=The tool parses syslog files and extracts all policy , AVC and change of boolean messages. 
-#Icon=/usr/share/pixmaps/seaudit.xpm
+Icon=seaudit.png
 Exec=/usr/bin/seaudit
 Type=Application
 Terminal=false
diff --git a/seaudit.png b/seaudit.png
new file mode 100644
index 0000000000000000000000000000000000000000..d2c3df619fa68735e2a1564cfdf717c4e8d66609
GIT binary patch
literal 1330
zcmV-21<m@2P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00004XF*Lt007q5
z)K6G40000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU$#7RU!RCwC7
zm0xUAWf;bPr<{(#wys-6w=rO2aY4p($uJQJ14Ck%7eo*YCYq=u120W55HF0wgcvg=
z;lfB_*igBE%w)qDVK@8Fh&U*#qGJeS>*%(2>%UQIS$llHvvzI+j5mDAb58S}^m*R*
zdEf8-G{Z1>qHB)8Yl35ftAg8tPXu<sR-4UcB=_nC?+A+iH@AA&ZTR2bn`hL2v&p!9
zW0x`MdBgblaG9|z1HTfiudg@y`}>WCh6bairp8#eZk>?~<XAE=`{M*O_1LstGk!do
zOCoJOcYhxv=JgOA9Y@cE+8<!=fd;CptI;%V7NJmxix)4_-Q7)BR~Igq%PE{~g7)M)
zFe|XJLNglcV05T}k~J~n(J0Z0DHdhGmyO^Wtwypy*Y$ZKYRwf?LJFOoo%HqfwF&pj
zGXmwBapqHqgmm(rD`iRH4#L+?;ko2NUjw^8g8d&Hr@XwJf`S6<5`b>En|PdHettfI
zKtR(?ui`KrfW_(4#6uHki_*#d`57|Kd$>>x;V7(JxzZ%JTCLnYas=<`(`1OCZS!Wb
ztE#XIQi2ja!C+9?ghf5vUQrg2tUQ>I8r=Wx1p09&+6@@F082fPot@3VzyL!-LvZjQ
ztDR2r4;?ZIhmRiRl8C#uZzm?-l|{)~U}j)<z<pa9;r<v|^84Ob9<s9JeL&C(lYeAj
zm*@%$3r)hPSmgHkn3BEBJ$uNhsiDAPA<gZ^nv+9EM+eD5&j{F-LQY-`k595F6-(Y1
z($(@ovhqoGZ&mF#tr;5|Q@)a!nMsZiDch7_I2>kZa*`zu2TwmrK-C}~7IH@pS~!Md
zZ5dNHuM)lYfaSUH*{Kt3+qTWjU@oc0<H7IuOSW0$=H^mVRAl-uLA0gL!oNipf$2y9
zYe^+bO5P+EvEaUNiRubC+jfts(NV0$#S9M*KSY`mjK|}t=-cNBC@T^o;3zZ*-@HbA
z(F$76j$nvAfBhmD1na(i_*SjLzGVx=J9a>6DWODyJ9q9dDfT$To>JLsZ*QNq$86h~
zQK1<fpNqh92>mGtTJQ`e(9_}OID8>Z(d8V(;&So#<;w(wWI7lm_skiSM3Ji+$;>iq
zqxwHJD$ESZo`q#{pnUz1_mXr}OM<djq`PFl^CUdK@m0ph$ML77p-TpiUAxE=Qnl0x
zzJC3>S)W_CZq4(5UJZ<CA%3tFixFYP7M(;?Hl}9mQ_)pcR?d1oF)_iY)I?dM#)ry4
z2{bo1&+~s?4OACp+hXWxC8U?^B;@=S-<5H8SHZhSn$7O0sHiY)P$-syr!r82Ci4RS
zXHT-(MIjj#x{QkZQ7nt?G)=ALy#cuUs}#!m_?e#)Qz9)bEe{Fkv!g;B$yy}`?6(oR
zN4}<}$xXV*_m9Zj9m9<NQA=6n^?GS+Y$OtiG%fr-GmCuG)_xCOxw9-XqJQdki(PQ|
zMR@R(h(@5PsmVOWbC(P>dU|>|ckUc@b#>}v?Lq;wO_QUx^~8s4eSHt~oQFQKth-l!
zUt!Q6H2?U5y1gWmq7551m_=2iqqnzLT{?17*eP&6@<vMvsC%|G`JQ_-wJiurecw9g
oURLA{|9NFT$z|aQuYUv>0K9NR41u*m8~^|S07*qoM6N<$g4f-ABme*a

literal 0
HcmV?d00001

diff --git a/sediffx.desktop b/sediffx.desktop
index 9af51a8..a5f31fa 100644
--- a/sediffx.desktop
+++ b/sediffx.desktop
@@ -9,3 +9,4 @@ Encoding=UTF-8
 Categories=Application;SystemSetup;X-Red-Hat-Base;
 X-Desktop-File-Install-Version=0.2
 StartupNotify=true
+Icon=sediffx.png
diff --git a/sediffx.png b/sediffx.png
new file mode 100644
index 0000000000000000000000000000000000000000..bd4f6c05d995a96e588f0e76ac3ae9823b308160
GIT binary patch
literal 1414
zcmV;11$p|3P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00004XF*Lt007q5
z)K6G40000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU%7)eAyRCwC7
zR&7jMRTzF+Zd=xGI##I2U<0I^QMwqnnau^9nwjYaW+56Eb(tZ?uV`e8n&`;<;o=`;
zn#?TOgcuVS<3tmK{!j?t!hphD*(e_!rH)c4ZK0*y-nPEy7CJyQYO*(Z?>Xn5d*0{$
zK35Wt$8krA0jy*q3-K)5`Y&uT8RC}AwB_{}v7X7}m_&(0!h{wRA7&fn<>mUCni}>#
z$xGj@T05Oi96s<EYD;&b*kl0a7T|DAqpaaduGKfs<kd?Idi3qxlW8d_$wu+M4Cu8o
zoI2fyz5yv-Kk_{G84RlcmL_1c_by+?lZzf~nO_8=G2$p7#1KRbPYjJWkp(53IS-aE
zKH?FR8F1^yBxd?=p<>$<r1wQo`BfE^d1bg~lTj47;vv$gZ4g^BG}!jpg;j2EDJ?~@
zI+a-fE>57~DKAC_dQtR{6oP6N5n}|>4Zz+Z;D@U&9No2Rg;+qd5QZkSK&QEc=IfA;
z7sQbR0Yv8j<3@^WiWw^Na|l?!gr~=YBm013O<kCu+yj$NmjqD=5z$SBMk87Sli2j;
zOQa>e3-cm-1s+yjs83oD4bUM@Ks4wh&C{VD+y>1>4_bDT92xERbVI4vW2J-W7>=i<
z;kBXbFl~_GMRh9qpGVWe0xJD;?2|eXATUo)0@rK?W`3UlXFUhaNhg@$Lw10$kyrb%
zC@>=<18TJzqoboDh>EQE#P3H{RTVy%n1DJK!-EG)k<;G~Uw^+(1Yo`nDdh-{@sO*4
z;6*3Y8er-Wy}v<9*>%Xw%oGJ0D5K<ZIZP%~GOO79(xpp@*l08&@87>a84FIUq=R?!
zm>2-IkW1!X2E1DVC8<1815}?lp9EO00k&SRK31jjGC+JO$V#mil0X!O!a~g12OtOn
zwv*c`->85>Q75{_VzHpDtu1-Dpr8Q5!^7g7SrHD0p=EMbfJhmDKyi=~3a875GXE$P
zSw(OU0*4*|HfQ<KI(!|DIFEX3H>Oqc1gjP3yfrS4GsGjo5fpr0fUfB-baZswwtz)1
zMiy+mD~{mUAmZ{)G=Ad-rhzsaxyeCance7?wLr3_&=^g8_!IOhDWrK)bObsulRX37
z!#Z#_?i6h|aV|>#dCDR=)kWYYkMXPDf}4#Zo<gE1l{n%9v$=`(M>M5e6h~u7A&%#4
zli1z$2(AUMVbDK_$g@0@^Bce&=Mt5iokiLgkZ>mjdk3)C9>u+n18MZ`{ZGk#yYI&@
zo83u`*TfKtTm#xG+7Zb1Blb)b+FC6*huA|M$sn@^I~P`AlPrj=-5g?JGKb=#quSvF
zInXO4J+t=q$UgWe7H@hH8u}R;zX~a1GWdG@EJ=>7Y85&a4^Ezs)U8h;(8pTEwAd<s
zJbeW(=wC&8diuIOCnqNdX0sW)s9(8XaYK=s3Z*gvkH>S{0)fg^E{l-ni_|KNs1I((
z1$#42O($9fOHamsM=qBO)z#JT`F!Z??8KQfXIQIF08DsD2zfx0L#^VP6RoausQ7Li
zsZ!wTAJi4y_($Q4>~=f6UN3Am8_u3R%UZ-+%X=w-5G4Kpigyq|kTT}$Za?f4qmxDC
zZ*pCiLyxylytA%gp6Air+>G}2b~H3JpsudY7Yc<+NPBBCDcHS9mDhOwT@*iE2K@Fb
zU}ZJX19bGlG3!rc!@r>KiEBxo?=P1=QSQ=3%@&QsRqT#l`$O=5SaPR-TmBSa0H}#v
UXsY_-X8-^I07*qoM6N<$f{1H_od5s;

literal 0
HcmV?d00001

diff --git a/setools.spec b/setools.spec
index 3262f58..c7667a3 100644
--- a/setools.spec
+++ b/setools.spec
@@ -1,7 +1,7 @@
 Summary: SELinux tools for managing policy
 Name: setools
 Version: 2.3
-Release: 2
+Release: 3
 License: GPL
 Group: System Environment/Base
 URL:	http://www.tresys.com/
@@ -11,6 +11,9 @@ Source4: seaudit.console
 Source5: apol.desktop
 Source7: seaudit.desktop
 Source9: sediffx.desktop
+Source10: seaudit.png
+Source11: apol.png
+Source12: sediffx.png
 
 Prefix: %{_prefix}
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -83,7 +86,7 @@ tools.
 
 %build
 make clean
-make LIBDIR=%{_libdir} all 
+make INSTALL_HELPDIR=/usr/share/doc/setools-%{version} LIBDIR=%{_libdir} all
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
@@ -93,6 +96,8 @@ mkdir -p $RPM_BUILD_ROOT/%_libdir
 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/tcl8.4
+mkdir -p $RPM_BUILD_ROOT/usr/share/pixmaps
+	
 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}/usr/bin/findcon
 rm -f ${RPM_BUILD_ROOT}/usr/bin/replcon
@@ -110,6 +115,10 @@ install -d -m 755 ${RPM_BUILD_ROOT}%{_datadir}/applications
 install -m 664 %{SOURCE5} ${RPM_BUILD_ROOT}%{_datadir}/applications/apol.desktop
 install -m 664 %{SOURCE7} ${RPM_BUILD_ROOT}%{_datadir}/applications/seaudit.desktop
 install -m 664 %{SOURCE9} ${RPM_BUILD_ROOT}%{_datadir}/applications/sediffx.desktop
+install -m 664 %{SOURCE10} ${RPM_BUILD_ROOT}/usr/share/pixmaps/seaudit.png
+install -m 664 %{SOURCE11} ${RPM_BUILD_ROOT}/usr/share/pixmaps/apol.png
+install -m 664 %{SOURCE12} ${RPM_BUILD_ROOT}/usr/share/pixmaps/sediffx.png
+
 cd $RPM_BUILD_ROOT/%{_bindir}/
 ln -sf consolehelper seaudit
 
@@ -168,6 +177,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_mandir}/man1/sediffx.1.gz
 %{_mandir}/man8/seaudit.8.gz
 %{_mandir}/man8/seaudit-report.8.gz
+%attr(0644,root,root) /usr/share/pixmaps/seaudit.png
+%attr(0644,root,root) /usr/share/pixmaps/apol.png
+%attr(0644,root,root) /usr/share/pixmaps/sediffx.png
 
 %package devel
 Summary: Development environment for SETools
@@ -220,6 +232,11 @@ Headers, static libraries and API docs for SETools.
 %{_libdir}/libsefs.so.1.2.1
 
 %changelog
+
+* Mon Apr 10 2006 Dan Walsh <dwalsh@redhat.com> 2.3-3
+- Fix help
+- Add icons
+
 * Tue Mar 21 2006 Dan Walsh <dwalsh@redhat.com> 2.3-2
 - Remove console apps for sediff, sediffx and apol