rpms/pcb/FC-5 .cvsignore, 1.4, 1.5 pcb.spec, 1.14, 1.15 sources, 1.4, 1.5 pcb-20060822-man.patch, 1.1, NONE
Chitlesh GOORAH (chitlesh)
fedora-extras-commits at redhat.com
Thu Jun 21 15:48:12 UTC 2007
Author: chitlesh
Update of /cvs/extras/rpms/pcb/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16404/FC-5
Modified Files:
.cvsignore pcb.spec sources
Removed Files:
pcb-20060822-man.patch
Log Message:
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pcb/FC-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 25 Aug 2006 20:17:16 -0000 1.4
+++ .cvsignore 21 Jun 2007 15:47:36 -0000 1.5
@@ -1 +1 @@
-pcb-20060822.tar.gz
+pcb-20070208p1.tar.gz
Index: pcb.spec
===================================================================
RCS file: /cvs/extras/rpms/pcb/FC-5/pcb.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- pcb.spec 4 Feb 2007 22:12:08 -0000 1.14
+++ pcb.spec 21 Jun 2007 15:47:36 -0000 1.15
@@ -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: 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 @@
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 @@
# 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 @@
%{_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 <chitlesh [AT] fedoraproject DOT org> - 0.20070208-2
+- fixed docdir
+
+* Fri Feb 09 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 0.20070208-1
+- New upstream release - 20070208
+
* Sun Feb 04 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 0.20060822-9
- fixed presence in gnome menu
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pcb/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 25 Aug 2006 20:17:16 -0000 1.4
+++ sources 21 Jun 2007 15:47:36 -0000 1.5
@@ -1 +1 @@
-e091285d6741860484b31e8ac5b7e37f pcb-20060822.tar.gz
+c4d7ead28e2b2ee6b171a94212a7bc2f pcb-20070208p1.tar.gz
--- pcb-20060822-man.patch DELETED ---
More information about the fedora-extras-commits
mailing list