rpms/pcb/devel .cvsignore, 1.5, 1.6 pcb.spec, 1.20, 1.21 sources, 1.5, 1.6 pcb.desktop, 1.8, NONE pcb.png, 1.1, NONE

[Chitlesh GOORAH (chitlesh)]

Author: chitlesh

Update of /cvs/pkgs/rpms/pcb/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7942/devel

Modified Files:
	.cvsignore pcb.spec sources 
Removed Files:
	pcb.desktop pcb.png 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pcb/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	21 Jun 2007 15:54:51 -0000	1.5
+++ .cvsignore	2 Feb 2008 12:11:51 -0000	1.6
@@ -1 +1 @@
-pcb-20070208p1.tar.gz
+pcb-20080202.tar.gz


Index: pcb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pcb/devel/pcb.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- pcb.spec	24 Aug 2007 10:57:18 -0000	1.20
+++ pcb.spec	2 Feb 2008 12:11:51 -0000	1.21
@@ -1,8 +1,8 @@
-%define         pcbver 20070208
+%define         pcbver 20080202
 
 Name:           pcb
 Version:        0.%{pcbver}
-Release:        3%{?dist}
+Release:        1%{?dist}
 
 Summary:        An interactive printed circuit board editor
 License:        GPLv2
@@ -11,14 +11,12 @@
 
 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
+BuildRequires:  cups, tetex-latex, libICE-devel, desktop-file-utils, intltool
 
 Requires:       m4
-Source0:        http://downloads.sourceforge.net/sourceforge/%{name}/%{name}-%{pcbver}p1.tar.gz
-Source1:        %{name}.desktop
-Source2:        %{name}.png
+Source0:        http://downloads.sourceforge.net/sourceforge/%{name}/%{name}-%{pcbver}.tar.gz
 
-Obsoletes:      pcb-doc
+Obsoletes:      pcb-doc < 20080202
 
 Requires(post): /sbin/install-info
 Requires(preun):/sbin/install-info
@@ -34,7 +32,9 @@
 
 
 %prep
-%setup -q -n %{name}-%{pcbver}p1
+%setup -q -n %{name}-%{pcbver}
+
+#%patch1 -p0 -b .default_font
 
 %{__sed} -i -e \
    's|pkgdatadir = $(datadir)/@PACKAGE@|pkgdatadir = %{_datadir}/%{name}/tutorial|' \
@@ -48,21 +48,23 @@
 CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{_prefix} --bindir=%{_bindir} \
     --datadir=%{_datadir} --includedir=%{_includedir}                       \
     --libdir=%{_libdir} --mandir=%{_mandir} --sysconfdir=%{_sysconfdir}     \
-    --infodir=%{_infodir}
+    --infodir=%{_infodir} --disable-update-mime-database
 
 %{__make} %{?_smp_mflags}
 
 
 %install
 %{__rm} -rf %{buildroot}
-%{__make} DESTDIR=%{buildroot} INSTALL="install -p" install
+%{__make} DESTDIR=%{buildroot} INSTALL="%{_bindir}/install -p" install
 
 # in /usr/share/pcb/newlib/ folder, cypress, sockets and toko are empty folders
 
 desktop-file-install --vendor fedora           \
+    --add-category X-Fedora                    \
     --add-category Engineering                 \
     --dir %{buildroot}%{_datadir}/applications \
-    %{SOURCE1}
+    --delete-original                          \
+    %{buildroot}%{_datadir}/applications/%{name}.desktop
 
 # restructuring for docdir
 %{__rm} -rf example/*
@@ -93,11 +95,10 @@
 
 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
+#{__rm} -f %{buildroot}%{_infodir}/dir
 
+# locale's
+%find_lang %{name}
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -121,7 +122,7 @@
 # Ignored warning W: pcb devel-file-in-non-devel-package /usr/share/pcb/tools/gerbertotk.c
 
 
-%files
+%files -f %{name}.lang
 %defattr(-, root, root, -)
 %doc AUTHORS COPYING README NEWS ChangeLog
 %doc README_FILES/CHANGES README_FILES/Whats_new_in_2.0
@@ -131,15 +132,22 @@
 %{_bindir}/%{name}
 %{_bindir}/MergePCBPS
 %{_bindir}/Merge_dimPCBPS
-%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
 %{_datadir}/%{name}/
 %{_infodir}/%{name}*
 %{_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
-* Fri Aug 24 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 0.20070208-3
-- mass rebuild for fedora 8 - ppc
+* Sat Feb 02 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 0.20080202-1
+- fixed docdir
+- new upstream release
+- treat locales properly
 
 * Thu Jun 21 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 0.20070208-2
 - fixed docdir


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pcb/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	21 Jun 2007 15:54:51 -0000	1.5
+++ sources	2 Feb 2008 12:11:51 -0000	1.6
@@ -1 +1 @@
-c4d7ead28e2b2ee6b171a94212a7bc2f  pcb-20070208p1.tar.gz
+933eda642f3838b24d417224693f8386  pcb-20080202.tar.gz


--- pcb.desktop DELETED ---