rpms/pcb/FC-5 pcb.spec,1.11,1.12

[Chitlesh GOORAH (chitlesh)]

Author: chitlesh

Update of /cvs/extras/rpms/pcb/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26711/FC-5

Modified Files:
	pcb.spec 
Log Message:
auto-import pcb-0.20060822-6 on branch FC-5 from pcb-0.20060822-6.src.rpm


Index: pcb.spec
===================================================================
RCS file: /cvs/extras/rpms/pcb/FC-5/pcb.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- pcb.spec	31 Aug 2006 23:30:42 -0000	1.11
+++ pcb.spec	27 Sep 2006 17:24:42 -0000	1.12
@@ -1,22 +1,22 @@
-%define     pcbver 20060822
+%define         pcbver 20060822
 
-Name:       pcb
-Version:    0.%{pcbver}
-Release:    4%{?dist}
-
-Summary:    An interactive printed circuit board editor
-License:    GPL
-Group:      Applications/Engineering
-URL:        http://pcb.sourceforge.net
+Name:           pcb
+Version:        0.%{pcbver}
+Release:        6%{?dist}
+
+Summary:        An interactive printed circuit board editor
+License:        GPL
+Group:          Applications/Engineering
+URL:            http://pcb.sourceforge.net
 
-BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  tcl, bison, flex, gawk, ImageMagick, gtk2-devel, gd-devel, fontconfig-devel
 BuildRequires:  cups, tetex-latex, libICE-devel, desktop-file-utils
 
 Requires:       m4
-Source0:    http://optusnet.dl.sourceforge.net/sourceforge/%{name}/%{name}-%{pcbver}.tar.gz
-Source1:    %{name}.desktop
-Source2:    %{name}.png
+Source0:        http://optusnet.dl.sourceforge.net/sourceforge/%{name}/%{name}-%{pcbver}.tar.gz
+Source1:        %{name}.desktop
+Source2:        %{name}.png
 
 %description
 PCB is an interactive printed circuit board editor for the X window system.
@@ -27,11 +27,11 @@
 tremendously reduce layout time.
 
 %package doc
-Summary: Documentation for PCB, an interactive printed circuit board editor
-Group: Documentation
-Requires: pcb = %{version}
-Requires(post):  /sbin/install-info
-Requires(preun): /sbin/install-info
+Summary:        Documentation for PCB, an interactive printed circuit board editor
+Group:          Documentation
+Requires:       pcb = %{version}
+Requires(post): /sbin/install-info
+Requires(preun):/sbin/install-info
 
 %description doc
 This package contains the documentation of pcb in html, pdf, postscript and
@@ -48,16 +48,18 @@
     --libdir=%{_libdir} --mandir=%{_mandir} --sysconfdir=%{_sysconfdir} \
     --infodir=%{_infodir}
 
-make %{?_smp_mflags}
+%{__make} %{?_smp_mflags}
 
 %install
-rm -rf %{buildroot}
-make DESTDIR=$RPM_BUILD_ROOT install
-rm $RPM_BUILD_ROOT/%{_datadir}/pcb/tools/gerbertotk.c
-chmod 0755 $RPM_BUILD_ROOT/%{_datadir}/pcb/tools/{PCB2HPGL,Merge*,tgo2pcb.tcl}
-rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/
-cp %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
+%{__rm} -rf %{buildroot}
+%{__make} DESTDIR=%{buildroot} install
+
+%{__rm} -f %{buildroot}/%{_datadir}/pcb/tools/gerbertotk.c
+%{__chmod} 0755 %{buildroot}/%{_datadir}/pcb/tools/{PCB2HPGL,Merge*,tgo2pcb.tcl}
+%{__rm} -f %{buildroot}%{_infodir}/dir
+
+%{__mkdir} -p %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/
+%{__cp} -p %{SOURCE2} %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
 
 desktop-file-install --vendor fedora \
     --add-category Engineering \
@@ -65,49 +67,41 @@
     --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \
     %{SOURCE1}
 
+
 %clean
-rm -rf %{buildroot}
+%{__rm} -rf %{buildroot}
+
 
 %post doc
 /sbin/install-info --quiet --info-dir=%{_infodir} %{_infodir}/pcb.info.gz >/dev/null 2>&1
 touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+
 
 %preun doc
 if [ $1 = 0 ]; then
   /sbin/install-info --quiet --info-dir=%{_infodir} --delete %{_infodir}/pcb.info.gz >/dev/null 2>&1
 fi
 touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+
 
 %files
 %defattr(-, root, root, -)
-%doc AUTHORS COPYING README README.* NEWS ChangeLog
+%doc AUTHORS COPYING README NEWS ChangeLog
 %{_datadir}/applications/fedora-%{name}.desktop
-%{_bindir}/*
+%{_bindir}/%{name}
+%{_bindir}/%{name}-bin
+%{_bindir}/MergePCBPS
+%{_bindir}/Merge_dimPCBPS
 %{_datadir}/icons/hicolor/32x32/apps/%{name}.png
-%{_datadir}/%{name}/CreateLibrary*
-%{_datadir}/%{name}/ListLibraryContents.sh
-%{_datadir}/%{name}/Pcb
-%{_datadir}/%{name}/QueryLibrary.sh
-%{_datadir}/%{name}/default_font
-%{_datadir}/%{name}/examples/
-%{_datadir}/%{name}/m4/
-%{_datadir}/%{name}/newlib/
-%{_datadir}/%{name}/pcb-menu.res
-%{_datadir}/%{name}/pcblib*
-%{_datadir}/%{name}/qfp*
-%{_datadir}/%{name}/tools/
+%{_datadir}/%{name}/
 
 
 %files doc
 %defattr(-, root, root, 0755)
-%{_infodir}/*
-%{_mandir}/man1/*
+%{_infodir}/%{name}*
+%{_mandir}/man1/%{name}*
 %{_datadir}/%{name}/pad*
 %{_datadir}/%{name}/pcb.*
 %{_datadir}/%{name}/puller.*
@@ -116,6 +110,12 @@
 %{_datadir}/%{name}/tutorial/
 
 %Changelog
+* Fri Sep 15 2006 Chitlesh Goorah <chitlesh at fedoraproject.org> - 0.20060822-6
+- Fixed ownership of %%{_datadir}/%%{name}/ #206405
+ 
+* Fri Sep 01 2006 Chitlesh Goorah <chitlesh at fedoraproject.org> - 0.20060822-5
+- release for devel
+
 * Fri Sep 01 2006 Chitlesh Goorah <chitlesh at fedoraproject.org> - 0.20060822-4
 - Added m4 as requires: to fix the error msg:
 -       can't find default font-symbol-file 'default_font'