rpms/pcb/F-9 import.log, NONE, 1.1 .cvsignore, 1.6, 1.7 pcb.spec, 1.23, 1.24 sources, 1.6, 1.7

[Chitlesh GOORAH]

Author: chitlesh

Update of /cvs/pkgs/rpms/pcb/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29444/F-9

Modified Files:
	.cvsignore pcb.spec sources 
Added Files:
	import.log 
Log Message:
20081128


--- NEW FILE import.log ---
pcb-0_20081128-1_fc10:F-9:pcb-0.20081128-1.fc10.src.rpm:1227992054


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pcb/F-9/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	2 Feb 2008 12:11:51 -0000	1.6
+++ .cvsignore	29 Nov 2008 20:54:55 -0000	1.7
@@ -1 +1 @@
-pcb-20080202.tar.gz
+pcb-20081128.tar.gz


Index: pcb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pcb/F-9/pcb.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- pcb.spec	8 Feb 2008 18:10:41 -0000	1.23
+++ pcb.spec	29 Nov 2008 20:54:55 -0000	1.24
@@ -1,8 +1,8 @@
-%define         pcbver 20080202
+%define         pcbver 20081128
 
 Name:           pcb
 Version:        0.%{pcbver}
-Release:        2%{?dist}
+Release:        1%{?dist}
 
 Summary:        An interactive printed circuit board editor
 License:        GPLv2
@@ -14,9 +14,9 @@
 BuildRequires:  cups, tetex-latex, libICE-devel, desktop-file-utils, intltool, gettext-devel
 
 Requires:       m4
-Source0:        http://downloads.sourceforge.net/sourceforge/%{name}/%{name}-%{pcbver}.tar.gz
+Requires:       electronics-menu
 
-Obsoletes:      pcb-doc < 20080202
+Source0:        http://downloads.sourceforge.net/sourceforge/%{name}/%{name}-%{pcbver}.tar.gz
 
 Requires(post): /sbin/install-info
 Requires(preun):/sbin/install-info
@@ -34,21 +34,24 @@
 %prep
 %setup -q -n %{name}-%{pcbver}
 
-#%patch1 -p0 -b .default_font
-
-%{__sed} -i -e \
-   's|pkgdatadir = $(datadir)/@PACKAGE@|pkgdatadir = %{_datadir}/%{name}/tutorial|' \
-   doc/Makefile.in
-
+%{__sed} -i \
+    's|examplesdir = $(pkgdatadir)/examples|examplesdir = example/|' \
+   example/Makefile.in
+
+install -d example/thermal
+install -d example/pad
+install -d example/puller
+install -d example/LED_Interface
+%{__cp} tutorial/tut1.pcb example/LED_Interface
+
+# rpmlint W: spurious-executable-perm
+chmod 0644 example/LED.NET
+chmod 0644 example/LED
 
 %build
-WISH=/usr/bin/wish
-export WISH
+export WISH=%{_bindir}/wish
 
-CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{_prefix} --bindir=%{_bindir} \
-    --datadir=%{_datadir} --includedir=%{_includedir}                       \
-    --libdir=%{_libdir} --mandir=%{_mandir} --sysconfdir=%{_sysconfdir}     \
-    --infodir=%{_infodir} --disable-update-mime-database
+%configure --disable-update-mime-database
 
 %{__make} %{?_smp_mflags}
 
@@ -57,33 +60,37 @@
 %{__rm} -rf %{buildroot}
 %{__make} DESTDIR=%{buildroot} INSTALL="%{_bindir}/install -p" install
 
-# in /usr/share/pcb/newlib/ folder, cypress, sockets and toko are empty folders
+# in /usr/share/pcb/newlib/ folder, sockets is an empty folder
 
 desktop-file-install --vendor fedora           \
-    --add-category X-Fedora                    \
-    --add-category Engineering                 \
-    --add-category Science                     \
     --dir %{buildroot}%{_datadir}/applications \
     --delete-original                          \
     %{buildroot}%{_datadir}/applications/%{name}.desktop
 
-# 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/
+# restructuring for docdir and tutorial
+# renaming to .pcb extension
+%{__mv} example/LED  example/LED.pcb
+%{__mv} example/LED2 example/LED2.pcb
+
+%{__rm} -f example/Makefile*
+%{__rm} -f example/*/Makefile*
+
+%{__mv} example/LED*.* example/LED_Interface
+
+install -p -m 0644 doc/thermal.{pcb,pdf,gif,png} example/thermal/
+install -p -m 0644 doc/pad.{pcb,pdf,gif,png}     example/pad/
+install -p -m 0644 doc/puller.{pcb,pdf,gif,png}  example/puller/
+
 %{__rm} -rf %{buildroot}%{_datadir}/%{name}/tutorial/
+%{__rm} -rf %{buildroot}%{_datadir}/%{name}/example/
+%{__rm} -rf %{buildroot}%{_docdir}/%{name}
 
 ## --- 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
 
-%{__rm} -rf %{buildroot}%{_datadir}/info/dir
-
 # Removes duplicates
 %{__rm} -f %{buildroot}%{_datadir}/%{name}/tools/apctools.zip
 %{__rm} -f %{buildroot}%{_datadir}/%{name}/tools/{MergePCBPS,Merge_dimPCBPS}
@@ -98,16 +105,14 @@
 
 chmod 755 %{buildroot}%{_datadir}/%{name}/tools/{PCB2HPGL,tgo2pcb.tcl}
 
-#{__rm} -f %{buildroot}%{_infodir}/dir
+
+%{__rm} -rf %{buildroot}%{_datadir}/info/dir
+
+# Bug 472618
+%{__rm} -f %{buildroot}%{_datadir}/applications/mimeinfo.cache
 
 # locale's
-#find_lang %{name}
-if [ -d %{buildroot}%{_datadir}/locale/ ]; then
-  for lang_dir in %{buildroot}%{_datadir}/locale/* ; do
-    lang=$(basename $lang_dir)
-    echo "%lang($lang) %{_datadir}/locale/$lang/LC_MESSAGES/pcb.mo" >> %{name}.lang
-  done
-fi
+%find_lang %{name}
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -125,17 +130,15 @@
 
 
 %preun
-/sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || :
-
+/sbin/install-info --delete %{_infodir}/%{name}.info*.gz %{_infodir}/dir || :
 
 # Ignored warning W: pcb devel-file-in-non-devel-package /usr/share/pcb/tools/gerbertotk.c
 
-
 %files -f %{name}.lang
 %defattr(-, root, root, -)
 %doc AUTHORS COPYING README NEWS ChangeLog
 %doc README_FILES/CHANGES README_FILES/Whats_new_in_2.0
-%doc example/ tutorial/
+%doc example/ doc/refcard.pdf doc/pcb.pdf
 
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_bindir}/%{name}
@@ -146,13 +149,18 @@
 %{_mandir}/man1/%{name}*
 %{_datadir}/icons/hicolor/*/mimetypes/application-x-*
 %{_datadir}/icons/hicolor/*/apps/%{name}.*
-%{_datadir}/applications/mimeinfo.cache
 %{_datadir}/mime/packages/pcb.xml
 %{_datadir}/mimelnk/application/x-excellon.desktop
 %{_datadir}/mimelnk/application/x-gerber.desktop
 %{_datadir}/mimelnk/application/x-pcb-*.desktop
 
+
 %Changelog
+* Sat Nov 29 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 0.20081128-1
+- new upstream release
+- restructuring docs, tutorials and examples
+- Fixed Bug 472618 -  Must not include /usr/share/applications/mimeinfo.cache
+
 * Sat Feb 09 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 0.20080202-2
 - added gettext-devel as BR
 - treat locales properly


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pcb/F-9/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	2 Feb 2008 12:11:51 -0000	1.6
+++ sources	29 Nov 2008 20:54:55 -0000	1.7
@@ -1 +1 @@
-933eda642f3838b24d417224693f8386  pcb-20080202.tar.gz
+e192ee993b04749f82dd3e8b529d40c0  pcb-20081128.tar.gz