From 0027fdce20874d8474127531037631b381ff090e Mon Sep 17 00:00:00 2001 From: Chitlesh GOORAH Date: Dec 24 2006 16:25:39 +0000 Subject: auto-import pcb-0.20060822-7 on branch devel from pcb-0.20060822-7.src.rpm --- diff --git a/pcb-20060822-man.patch b/pcb-20060822-man.patch new file mode 100644 index 0000000..c036b95 --- /dev/null +++ b/pcb-20060822-man.patch @@ -0,0 +1,41 @@ +--- doc/pcb.1 2004-08-24 23:44:24.000000000 +0200 ++++ pcb.1_patched 2006-12-20 22:39:43.000000000 +0100 +@@ -33,14 +33,31 @@ + is provided in a GNU texinfo format as well as HTML and PDF. + The texinfo version of the manual is typically viewed with the + .B info +-program or alternatively with +-.B emacs +-or a graphical info viewer such as +-.B tkinfo +-. The PDF and HTML documentation is typically installed as +-/usr/local/share/pcb/pcb.html and /usr/local/share/pcb/pcb.pdf. +-The prefix "/usr/local" may vary at your site. ++program. + ++.SH FEDORA ++Fedora provides ++.B refcard.pdf ++with the ++.B pcb ++package which is a set of keyboard shortcuts for pcb. + ++Fedora supplies both the HTML and PDF documentation of Pcb with the ++.B pcb-doc ++package. ++.br ++To install the ++.B pcb-doc ++package on your Fedora Operating System: ++ ++.br ++$ ++.B su - "yum install pcb-doc" ++.br ++(you will be asked to enter the root password) ++ ++.br ++The HTML and PDF documentation are installed as /usr/share/pcb/tutorial/pcb.html ++/usr/share/pcb/tutorial/pcb.pdf respectively. + + diff --git a/pcb.desktop b/pcb.desktop index 361fb48..2516067 100644 --- a/pcb.desktop +++ b/pcb.desktop @@ -6,5 +6,5 @@ Icon=pcb Type=Application Terminal=false GenericName=PCB -Categories=Education;Science;X-Fedora;Engineering; +Categories=Science; X-Desktop-File-Install-Version=0.10 \ No newline at end of file diff --git a/pcb.spec b/pcb.spec index b6b81dd..955c5cd 100644 --- a/pcb.spec +++ b/pcb.spec @@ -2,7 +2,7 @@ Name: pcb Version: 0.%{pcbver} -Release: 6%{?dist} +Release: 7%{?dist} Summary: An interactive printed circuit board editor License: GPL @@ -18,6 +18,8 @@ Source0: http://optusnet.dl.sourceforge.net/sourceforge/%{name}/%{name}-% Source1: %{name}.desktop Source2: %{name}.png +Patch0: %{name}-%{pcbver}-man.patch + %description PCB is an interactive printed circuit board editor for the X window system. PCB includes a rats nest feature, design rule checking, and can provide @@ -29,17 +31,24 @@ tremendously reduce layout time. %package doc Summary: Documentation for PCB, an interactive printed circuit board editor Group: Documentation -Requires: pcb = %{version} +Requires: %{name} = %{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 -info format. +This package contains the documentation of pcb in pdf and postscript +format. %prep %setup -q -n %{name}-%{pcbver} +%patch0 -p0 -b .man + +#FIXME: ADD the url of refcard.pdf to the man +%{__sed} -i -e \ + 's|pkgdatadir = $(datadir)/@PACKAGE@|pkgdatadir = $(datadir)/@PACKAGE@/tutorial|' \ + doc/Makefile.in + %build WISH=/usr/bin/wish export WISH @@ -52,95 +61,130 @@ CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{_prefix} --bindir=%{_bindir} \ %install %{__rm} -rf %{buildroot} -%{__make} DESTDIR=%{buildroot} install +%{__make} DESTDIR=%{buildroot} INSTALL="install -p" install + +chmod 755 %{buildroot}%{_datadir}/%{name}/tools/{PCB2HPGL,tgo2pcb.tcl} + +# Removed duplicates: +%{__rm} -f %{buildroot}%{_datadir}/%{name}/tools/{MergePCBPS,Merge_dimPCBPS} -%{__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 \ - --add-category X-Fedora \ - --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ +# in /usr/share/pcb/newlib/ folder, cypress, sockets and toko are empty folders + +desktop-file-install --vendor "" \ + --add-category Engineering \ + --dir %{buildroot}%{_datadir}/applications \ %{SOURCE1} +# Added the same set example in folder examples/ +%{__mv} %{buildroot}%{_datadir}/%{name}/tutorial/tut1.pcb %{buildroot}%{_datadir}/%{name}/examples/ + + +## --- pcb supports for acpcircuits +# http://www.apcircuits.com/resources/links/pcb_unix.html + +unzip tools/apctools.zip +install -p -m 755 apc*.pl %{buildroot}%{_datadir}/%{name}/tools + +# Removes duplicates +%{__rm} -f %{buildroot}%{_datadir}/%{name}/tools/apctools.zip + +## --- %clean %{__rm} -rf %{buildroot} - -%post doc -/sbin/install-info --quiet --info-dir=%{_infodir} %{_infodir}/pcb.info.gz >/dev/null 2>&1 +%post +/sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || : touch --no-create %{_datadir}/icons/hicolor || : %{_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 +%postun touch --no-create %{_datadir}/icons/hicolor || : %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +%preun +if [ $1 -eq 0 ]; then + /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || : +fi + +# Ignored warning W: pcb devel-file-in-non-devel-package /usr/share/pcb/tools/gerbertotk.c %files %defattr(-, root, root, -) %doc AUTHORS COPYING README NEWS ChangeLog -%{_datadir}/applications/fedora-%{name}.desktop +%doc README_FILES/CHANGES README_FILES/Whats_new_in_2.0 + +%exclude %{_datadir}/%{name}/tutorial/pad* +%exclude %{_datadir}/%{name}/tutorial/pcb* +%exclude %{_datadir}/%{name}/tutorial/puller* +%exclude %{_datadir}/%{name}/tutorial/refcard.ps +%exclude %{_datadir}/%{name}/tutorial/thermal* +%dir %{_datadir}/%{name}/tutorial/ +%{_datadir}/%{name}/tutorial/refcard.pdf + +%{_datadir}/applications/%{name}.desktop %{_bindir}/%{name} %{_bindir}/%{name}-bin %{_bindir}/MergePCBPS %{_bindir}/Merge_dimPCBPS %{_datadir}/icons/hicolor/32x32/apps/%{name}.png %{_datadir}/%{name}/ - - -%files doc -%defattr(-, root, root, 0755) %{_infodir}/%{name}* %{_mandir}/man1/%{name}* -%{_datadir}/%{name}/pad* -%{_datadir}/%{name}/pcb.* -%{_datadir}/%{name}/puller.* -%{_datadir}/%{name}/refcard.* -%{_datadir}/%{name}/thermal* -%{_datadir}/%{name}/tutorial/ + +%files doc +# rpmlint W: pcb-doc no-documentation +%defattr(-, root, root, -) +%{_datadir}/%{name}/tutorial/pad* +%{_datadir}/%{name}/tutorial/pcb* +%{_datadir}/%{name}/tutorial/puller* +%{_datadir}/%{name}/tutorial/refcard.ps +%{_datadir}/%{name}/tutorial/thermal* %Changelog -* Fri Sep 15 2006 Chitlesh Goorah - 0.20060822-6 +* Fri Dec 22 2006 Chitlesh Goorah - 0.20060822-7 +- Fixed info files and added to the pcb package #219406 +- Fixed man pages (with patch0 to suit fedora packaging of pcb +- Added refcard.pdf in pcb binary package +- Removed duplicated MergePCBPS and Merge_dimPCBPS from pcb binary package +- pcb supports for acpcircuits included + +* Fri Sep 15 2006 Chitlesh Goorah - 0.20060822-6 - Fixed ownership of %%{_datadir}/%%{name}/ #206405 - -* Fri Sep 01 2006 Chitlesh Goorah - 0.20060822-5 + +* Fri Sep 01 2006 Chitlesh Goorah - 0.20060822-5 - release for devel -* Fri Sep 01 2006 Chitlesh Goorah - 0.20060822-4 +* Fri Sep 01 2006 Chitlesh Goorah - 0.20060822-4 - Added m4 as requires: to fix the error msg: - can't find default font-symbol-file 'default_font' -* Fri Aug 25 2006 Chitlesh Goorah - 0.20060822-3 +* Fri Aug 25 2006 Chitlesh Goorah - 0.20060822-3 - release for devel -* Fri Aug 25 2006 Chitlesh Goorah - 0.20060822-2 +* Fri Aug 25 2006 Chitlesh Goorah - 0.20060822-2 - release for FC5 and minor fixes -* Fri Aug 25 2006 Chitlesh Goorah - 0.20060822-1 +* Fri Aug 25 2006 Chitlesh Goorah - 0.20060822-1 - updated to 20060822's snapshot -* Wed Jul 11 2006 Chitlesh Goorah - 0.20060422-4 +* Wed Jul 11 2006 Chitlesh Goorah - 0.20060422-4 - pcbver corrected in pcb.desktop * Sun Jul 09 2006 Chitlesh Goorah - 0.20060422-3 - fixed the icon of pcb -* Sun Jul 09 2006 Chitlesh Goorah - 0.20060422-2 +* Sun Jul 09 2006 Chitlesh Goorah - 0.20060422-2 - fixed E: pcb info-dir-file /usr/share/info/dir - added /sbin/install-info as requires for %%post and %%preun - added icon and treated GTK+ icon cache as required -* Thu Jul 06 2006 Chitlesh Goorah - 0.20060422-1 +* Thu Jul 06 2006 Chitlesh Goorah - 0.20060422-1 - New upstream release 20060422 - Minor fixes to work under mock