rpms/pcb/devel pcb.png, NONE, 1.1 .cvsignore, 1.2, 1.3 pcb.desktop, 1.1, 1.2 pcb.spec, 1.4, 1.5 sources, 1.2, 1.3
Chitlesh GOORAH (chitlesh)
fedora-extras-commits at redhat.com
Mon Jul 10 11:24:03 UTC 2006
Author: chitlesh
Update of /cvs/extras/rpms/pcb/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9562/devel
Modified Files:
.cvsignore pcb.desktop pcb.spec sources
Added Files:
pcb.png
Log Message:
auto-import pcb-0.20060422-3 on branch devel from pcb-0.20060422-3.src.rpm
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pcb/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 20 Apr 2006 23:45:16 -0000 1.2
+++ .cvsignore 10 Jul 2006 11:24:03 -0000 1.3
@@ -1 +1 @@
-pcb-20060414.tar.gz
+pcb-20060422.tar.gz
Index: pcb.desktop
===================================================================
RCS file: /cvs/extras/rpms/pcb/devel/pcb.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pcb.desktop 20 Apr 2006 23:58:11 -0000 1.1
+++ pcb.desktop 10 Jul 2006 11:24:03 -0000 1.2
@@ -1,4 +1,5 @@
[Desktop Entry]
+Version=0.20060414
Encoding=UTF-8
Name=PCB
GenericName=PCB
@@ -6,4 +7,4 @@
Terminal=false
Type=Application
Categories=Application;Electronics;
-Version=0.20060414
+GenericName[en_US]=PCB
Index: pcb.spec
===================================================================
RCS file: /cvs/extras/rpms/pcb/devel/pcb.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- pcb.spec 21 Apr 2006 00:10:30 -0000 1.4
+++ pcb.spec 10 Jul 2006 11:24:03 -0000 1.5
@@ -1,17 +1,24 @@
-Summary: An interactive printed circuit board editor
-Name: pcb
-%define pcbver 20060414
-Version: 0.%{pcbver}
-Release: 1
-License: GPL
-Group: Applications/Engineering
-URL: http://pcb.sourceforge.net
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: tcl, bison, flex, gawk, ImageMagick, gtk2-devel, gd-devel
-BuildRequires: libjpeg-devel, fontconfig-devel
-BuildRequires: cups, tetex-latex, libICE-devel, desktop-file-utils
-Source0: http://prdownloads.sourceforge.net/pcb/pcb-%{pcbver}.tar.gz
-Source1: pcb.desktop
+%define pcbver 20060422
+
+Name: pcb
+Version: 0.%{pcbver}
+Release: 3
+
+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)
+BuildRequires: tcl, bison, flex, gawk, ImageMagick, gtk2-devel, gd-devel, fontconfig-devel
+BuildRequires: cups, tetex-latex, libICE-devel, desktop-file-utils
+
+Source0: http://optusnet.dl.sourceforge.net/sourceforge/%{name}/%{name}-%{pcbver}.tar.gz
+Source1: %{name}.desktop
+Source2: %{name}.png
+
+Requires(post): /sbin/install-info
+Requires(preun): /sbin/install-info
%description
PCB is an interactive printed circuit board editor for the X window system.
@@ -22,13 +29,15 @@
tremendously reduce layout time.
%prep
-%setup -q -n pcb-%{pcbver}
+%setup -q -n %{name}-%{pcbver}
%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} \
- --infodir=%{_infodir}
+ --datadir=%{_datadir} --includedir=%{_includedir} \
+ --libdir=%{_libdir} --mandir=%{_mandir} --sysconfdir=%{_sysconfdir} \
+ --infodir=%{_infodir}
make %{?_smp_mflags}
@@ -37,31 +46,57 @@
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
+
desktop-file-install --vendor fedora \
- --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \
- --add-category X-Fedora \
- %{SOURCE1}
+ --add-category Engineering \
+ --add-category X-Fedora \
+ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \
+ %{SOURCE1}
%clean
rm -rf %{buildroot}
%post
/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
%preun
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
%files
-%defattr(-, root, root)
+%defattr(-, root, root, -)
%doc AUTHORS COPYING README README.* NEWS ChangeLog
%{_mandir}/man1/*
-%{_datadir}/pcb*
-%{_datadir}/applications/fedora-pcb.desktop
+%{_datadir}/%{name}*
+%{_datadir}/applications/fedora-%{name}.desktop
%{_bindir}/*
+%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
%{_infodir}/*
%changelog
+* Sun Jul 09 2006 Chitlesh Goorah <chitlesh at fedoraproject.org> - 0.20060422-3
+- fixed the icon of pcb
+
+* Sun Jul 09 2006 Chitlesh Goorah <chitlesh at fedoraproject.org> - 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 <chitlesh at fedoraproject.org> - 0.20060422-1
+- New upstream release 20060422
+- Minor fixes to work under mock
+
* Wed Apr 19 2006 <pjones at redhat.com> - 0.20060414-1
- Let there be pcb packaging.
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pcb/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 20 Apr 2006 23:45:16 -0000 1.2
+++ sources 10 Jul 2006 11:24:03 -0000 1.3
@@ -1 +1 @@
-5e471a7b80f1b5ebf21be22c9b7a2e8e pcb-20060414.tar.gz
+f70af0f43d9cf1a98ec6a7681773b793 pcb-20060422.tar.gz
More information about the fedora-extras-commits
mailing list