rpms/geda-gaf/EL-6 .cvsignore, 1.2, 1.3 geda-gaf.spec, 1.1, 1.2 import.log, 1.1, 1.2 sources, 1.2, 1.3

Chitlesh GOORAH chitlesh at fedoraproject.org
Fri Jul 2 18:01:24 UTC 2010 

Author: chitlesh

Update of /cvs/pkgs/rpms/geda-gaf/EL-6
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv16844/EL-6

Modified Files:
	.cvsignore geda-gaf.spec import.log sources 
Log Message:
1.6.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/geda-gaf/EL-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	6 Oct 2009 09:43:52 -0000	1.2
+++ .cvsignore	2 Jul 2010 18:01:24 -0000	1.3
@@ -1 +1 @@
-geda-gaf-1.6.0.tar.gz
+geda-gaf-1.6.1.tar.gz


Index: geda-gaf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/geda-gaf/EL-6/geda-gaf.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- geda-gaf.spec	6 Oct 2009 09:43:52 -0000	1.1
+++ geda-gaf.spec	2 Jul 2010 18:01:24 -0000	1.2
@@ -1,13 +1,12 @@
 # As from 1.5, all the submodules of geda-gaf are packaged by upstream into one
-# big tarball. This requires a new fedora package review and obsoleting the old 
+# big tarball. This requires a new fedora package review and obsoleting the old
 # geda-* packages fedora was providing, which explains the use of Epoch.
 
-# Date : 31 August 2009, Chitlesh Goorah
-%define         snap   20091004
+%define         snap   20100214
 
 Name:           geda-gaf
 Epoch:          1
-Version:        1.6.0
+Version:        1.6.1
 Release:        1%{?dist}
 Summary:        Design Automation toolkit for electronic design
 
@@ -68,7 +67,9 @@ Development files for libgeda library
 %package      -n  geda-symbols
 Summary:          Electronic symbols for gEDA
 Group:            Applications/Engineering
+%if 0%{?fedora} > 9 || 0%{?rhel} > 5
 BuildArch:        noarch
+%endif
 BuildRequires:    transfig
 
 %description  -n  geda-symbols
@@ -79,7 +80,9 @@ used by gschem, the gEDA project schemat
 %package      -n  geda-docs
 Summary:          Documentation and Examples for gEDA
 Group:            Applications/Engineering
+%if 0%{?fedora} > 9 || 0%{?rhel} > 5
 BuildArch:        noarch
+%endif
 Requires:         geda-symbols
 Provides:         geda-examples     = %{?epoch:%{epoch}:}%{version}-%{release}
 Obsoletes:        geda-examples     < 20090830-2
@@ -159,21 +162,6 @@ Several utilities for the gEDA project.
 %prep
 %setup -q
 
-# Fixing rpmlints wrong-file-end-of-line-encoding
-for f in `find gnetlist/tests -name \*.net -or -name \*.pads | sort` ; do
-   echo -n -e "... Fixing the end-of-line encodings of $f  \t"
-   sed -i.bak -e 's|\r||g' $f
-   touch -r $f.bak $f
-   %{__rm} -f $f.bak
-   echo "done"
-done
-
-# rpmlint zero-length
-%{__rm} -f utils/tests/gxyrs/outputs/*-error
-%{__rm} -f gnetlist/tests/common/outputs/drc/multiequal-output.net
-%{__rm} -f gnetlist/tests/common/outputs/futurenet2/SlottedOpamps-output.net
-%{__rm} -f gnetlist/tests/common/outputs/switcap/SlottedOpamps-output.net
-
 # rpmlint UTF-8
 for f in symbols/{AUTHORS,ChangeLog-1.0} gschem/ChangeLog; do
    iconv -f ISO-8859-1 -t UTF-8 $f > $f.tmp && \
@@ -188,7 +176,7 @@ sed -i -e 's|"/lib /usr/lib|"/%{_lib} %{
 
 %build
 
-%configure  --disable-static
+%configure --disable-static
 %{__make} %{?_smp_mflags}
 
 
@@ -201,7 +189,7 @@ desktop-file-install --vendor "" \
     --dir %{buildroot}%{_datadir}/applications \
     --delete-original                          \
     %{buildroot}%{_datadir}/applications/geda-gschem.desktop \
-    %{buildroot}%{_datadir}/applications/geda-gattrib.desktop 
+    %{buildroot}%{_datadir}/applications/geda-gattrib.desktop
 
 
 %{__rm} -f %{buildroot}%{_libdir}/*.la
@@ -284,20 +272,6 @@ fi
 gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
-%post -n geda-utils
-touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-
-%postun -n geda-utils
-if [ $1 -eq 0 ] ; then
-    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
-    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
-fi
-
-%posttrans -n geda-utils
-gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
-
-
 %post -n libgeda
 /sbin/ldconfig
 update-mime-database %{_datadir}/mime &> /dev/null || :
@@ -309,6 +283,9 @@ update-mime-database %{_datadir}/mime &>
 %posttrans -n libgeda
 update-mime-database %{_datadir}/mime &> /dev/null || :
 
+# Package Self test
+%check
+make distcheck
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -346,6 +323,8 @@ update-mime-database %{_datadir}/mime &>
 %{_datadir}/gEDA/gafrc.d/geda-clib.scm
 %{_datadir}/mime/application/x-geda-symbol.xml
 %{_datadir}/icons/hicolor/*/mimetypes/application-x-geda-symbol.*
+%{_datadir}/mime/application/x-geda-gsch2pcb-project.xml
+%{_datadir}/icons/hicolor/*/mimetypes/application-x-geda-gsch2pcb-project.*
 
 
 %files -n geda-docs
@@ -448,11 +427,18 @@ update-mime-database %{_datadir}/mime &>
 %{_datadir}/gEDA/system-gschlasrc
 %{_mandir}/man1/grenum.1.gz
 %{_datadir}/gEDA/perl/lib/gxyrs.pm
-%{_datadir}/mime/application/x-geda-gsch2pcb-project.xml
-%{_datadir}/icons/hicolor/*/mimetypes/application-x-geda-gsch2pcb-project.*
 
 
 %changelog
+* Fri Jul  2 2010 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 1.6.1-1
+- new upstream release
+
+* Tue Nov 24 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 1.6.0-3
+- Enabling self test: https://fedorahosted.org/fedora-electronic-lab/ticket/56
+
+* Mon Nov 02 2009 Dennis Gilmore <dennis at ausil.us> - 1.6.0-2
+- RHEL-5 does not support noarch subpackages
+
 * Tue Oct  6 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 1.6.0-1
 - new upstream release
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/geda-gaf/EL-6/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	6 Oct 2009 09:43:52 -0000	1.1
+++ import.log	2 Jul 2010 18:01:24 -0000	1.2
@@ -1 +1,2 @@
 geda-gaf-1_6_0-1_fc11:F-12:geda-gaf-1.6.0-1.fc11.src.rpm:1254822157
+geda-gaf-1_6_1-1_fc12:EL-6:geda-gaf-1.6.1-1.fc12.src.rpm:1278093602


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/geda-gaf/EL-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	6 Oct 2009 09:43:53 -0000	1.2
+++ sources	2 Jul 2010 18:01:24 -0000	1.3
@@ -1 +1 @@
-1dacc71407e69d77eaf4c1115f5bcd56  geda-gaf-1.6.0.tar.gz
+c0049dd86c2ca3177bf3bafce85d6edd  geda-gaf-1.6.1.tar.gz

More information about the scm-commits mailing list