diff --git a/.cvsignore b/.cvsignore index 9a847a7..a07a705 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -pcb-20060822.tar.gz +pcb-20070208p1.tar.gz diff --git a/pcb-20060822-man.patch b/pcb-20060822-man.patch deleted file mode 100644 index c036b95..0000000 --- a/pcb-20060822-man.patch +++ /dev/null @@ -1,41 +0,0 @@ ---- 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.spec b/pcb.spec index 1d115bb..f12df3d 100644 --- a/pcb.spec +++ b/pcb.spec @@ -1,8 +1,8 @@ -%define pcbver 20060822 +%define pcbver 20070208 Name: pcb Version: 0.%{pcbver} -Release: 9%{?dist} +Release: 2%{?dist} Summary: An interactive printed circuit board editor License: GPL @@ -14,11 +14,16 @@ BuildRequires: tcl, bison, flex, gawk, ImageMagick, gtk2-devel, gd-devel, fontc BuildRequires: cups, tetex-latex, libICE-devel, desktop-file-utils Requires: m4 -Source0: http://optusnet.dl.sourceforge.net/sourceforge/%{name}/%{name}-%{pcbver}.tar.gz +Source0: http://downloads.sourceforge.net/sourceforge/%{name}/%{name}-%{pcbver}p1.tar.gz Source1: %{name}.desktop Source2: %{name}.png -Patch0: %{name}-%{pcbver}-man.patch +#Patch1: %{name}-default_font.patch +Obsoletes: pcb-doc + +Requires(post): /sbin/install-info +Requires(preun):/sbin/install-info + %description PCB is an interactive printed circuit board editor for the X window system. @@ -28,70 +33,59 @@ output for use in the board fabrication and assembly process. PCB offers high end features such as an autorouter and trace optimizer which can tremendously reduce layout time. -%package doc -Summary: Documentation for PCB, an interactive printed circuit board editor -Group: Documentation -Requires: %{name} = %{version} -Requires(post): /sbin/install-info -Requires(preun):/sbin/install-info - -%description doc -This package contains the documentation of pcb in pdf and postscript -format. %prep -%setup -q -n %{name}-%{pcbver} +%setup -q -n %{name}-%{pcbver}p1 -%patch0 -p0 -b .man +#%patch1 -p0 -b .default_font -#FIXME: ADD the url of refcard.pdf to the man %{__sed} -i -e \ - 's|pkgdatadir = $(datadir)/@PACKAGE@|pkgdatadir = $(datadir)/@PACKAGE@/tutorial|' \ + 's|pkgdatadir = $(datadir)/@PACKAGE@|pkgdatadir = %{_datadir}/%{name}/tutorial|' \ doc/Makefile.in + %build WISH=/usr/bin/wish export WISH + CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{_prefix} --bindir=%{_bindir} \ - --datadir=%{_datadir} --includedir=%{_includedir} \ - --libdir=%{_libdir} --mandir=%{_mandir} --sysconfdir=%{_sysconfdir} \ + --datadir=%{_datadir} --includedir=%{_includedir} \ + --libdir=%{_libdir} --mandir=%{_mandir} --sysconfdir=%{_sysconfdir} \ --infodir=%{_infodir} %{__make} %{?_smp_mflags} + %install %{__rm} -rf %{buildroot} %{__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}%{_infodir}/dir - -%{__mkdir} -p %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/ -%{__cp} -p %{SOURCE2} %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/%{name}.png - # in /usr/share/pcb/newlib/ folder, cypress, sockets and toko are empty folders -desktop-file-install --vendor "" \ - --add-category Engineering \ +desktop-file-install --vendor fedora \ + --add-category X-Fedora \ + --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/ +# restructuring for docdir +%{__rm} -rf example/* +%{__mv} %{buildroot}%{_datadir}/%{name}/examples/* example/ +%{__rm} -rf %{buildroot}%{_datadir}/%{name}/example/ +%{__mv} %{buildroot}%{_datadir}/%{name}/tutorial/tut1.pcb example/ +%{__rm} -f tutorial/* +%{__mv} %{buildroot}%{_datadir}/%{name}/tutorial/* tutorial/ +%{__rm} -rf %{buildroot}%{_datadir}/%{name}/tutorial/ ## --- 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 +%{__rm} -f %{buildroot}%{_datadir}/%{name}/tools/{MergePCBPS,Merge_dimPCBPS} ## --- @@ -101,41 +95,44 @@ install -p -m 755 apc*.pl %{buildroot}%{_datadir}/%{name}/tools # are no more needed. %{__rm} -f %{buildroot}%{_datadir}/%{name}/tools/pcb2ncap.tgz +chmod 755 %{buildroot}%{_datadir}/%{name}/tools/{PCB2HPGL,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 + + %clean %{__rm} -rf %{buildroot} + %post /sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || : touch --no-create %{_datadir}/icons/hicolor || : %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : + %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 +/sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || : + # 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 %doc README_FILES/CHANGES README_FILES/Whats_new_in_2.0 +%doc example/ tutorial/ -%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 +%{_datadir}/applications/fedora-%{name}.desktop %{_bindir}/%{name} -%{_bindir}/%{name}-bin %{_bindir}/MergePCBPS %{_bindir}/Merge_dimPCBPS %{_datadir}/icons/hicolor/32x32/apps/%{name}.png @@ -143,16 +140,14 @@ fi %{_infodir}/%{name}* %{_mandir}/man1/%{name}* -%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 +* Thu Jun 21 2007 Chitlesh Goorah - 0.20070208-2 +- fixed docdir + +* Fri Feb 09 2007 Chitlesh Goorah - 0.20070208-1 +- New upstream release - 20070208 + * Sun Feb 04 2007 Chitlesh Goorah - 0.20060822-9 - fixed presence in gnome menu diff --git a/sources b/sources index 3b3037d..7232624 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e091285d6741860484b31e8ac5b7e37f pcb-20060822.tar.gz +c4d7ead28e2b2ee6b171a94212a7bc2f pcb-20070208p1.tar.gz