rpms/libdwarf/F-13 .cvsignore, 1.2, 1.3 libdwarf-soname-fix.patch, 1.1, 1.2 libdwarf.spec, 1.2, 1.3 sources, 1.2, 1.3

paragn paragn at fedoraproject.org
Tue Jul 6 10:41:01 UTC 2010


Author: paragn

Update of /cvs/pkgs/rpms/libdwarf/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv9227

Modified Files:
	.cvsignore libdwarf-soname-fix.patch libdwarf.spec sources 
Log Message:
* Tue Jul 06 2010 Parag Nemade <paragn AT fedoraproject.org> - 0.20100629-1
- Update to 20100629 release
- Add -static subpackage as request in rh#586807



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libdwarf/F-13/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	1 Apr 2009 16:55:45 -0000	1.2
+++ .cvsignore	6 Jul 2010 10:41:01 -0000	1.3
@@ -1 +1 @@
-libdwarf-20090324.tar.gz
+libdwarf-20100629.tar.gz

libdwarf-soname-fix.patch:
 Makefile.in |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Index: libdwarf-soname-fix.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libdwarf/F-13/libdwarf-soname-fix.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- libdwarf-soname-fix.patch	1 Apr 2009 16:55:45 -0000	1.1
+++ libdwarf-soname-fix.patch	6 Jul 2010 10:41:01 -0000	1.2
@@ -1,13 +1,13 @@
---- dwarf-20090324-base/libdwarf/Makefile.in	2009-03-24 15:31:18.000000000 -0500
-+++ dwarf-20090324/libdwarf/Makefile.in	2009-03-25 18:52:52.000000000 -0500
-@@ -127,8 +127,8 @@
- libdwarf.a:	$(OBJS)
- 	$(AR) $(ARFLAGS) $@ $(OBJS) 
+--- libdwarf/Makefile.in.old	2010-06-29 22:45:03.000000000 +0530
++++ libdwarf/Makefile.in	2010-07-02 11:48:07.000000000 +0530
+@@ -130,8 +130,8 @@ all: @build_shared@ @build_nonshared@
+ libdwarf.a: dwarf_names.h dwarf_names.c  $(OBJS) dwarf_names.o
+ 	$(AR) $(ARFLAGS) $@ $(OBJS)  dwarf_names.o
  
--libdwarf.so:	$(OBJS)
--	$(CC) $(CFLAGS) -shared $(OBJS) -o $@
-+libdwarf.so.0.0:	$(OBJS)
-+	$(CC) $(CFLAGS) -shared $(OBJS) -Wl,-soname,libdwarf.so.0.0 -o $@
+-libdwarf.so: dwarf_names.h dwarf_names.c $(OBJS) dwarf_names.o
+-	$(CC) $(CFLAGS) -shared $(OBJS)  dwarf_names.o -o $@
++libdwarf.so.0.0: dwarf_names.h dwarf_names.c $(OBJS) dwarf_names.o
++	$(CC) $(CFLAGS) -shared $(OBJS) -Wl,-soname,libdwarf.so.0 dwarf_names.o -o $@
  
  none:
  	echo "do nothing"


Index: libdwarf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libdwarf/F-13/libdwarf.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- libdwarf.spec	25 Jul 2009 05:32:52 -0000	1.2
+++ libdwarf.spec	6 Jul 2010 10:41:01 -0000	1.3
@@ -1,14 +1,13 @@
-%define   upstreamid 20090324
+%define   upstreamid 20100629
 
 Summary:       Library to access the DWARF Debugging file format 
 Name:          libdwarf
 Version:       0.%{upstreamid}
-Release:       5%{?dist}
+Release:       1%{?dist}
 License:       LGPLv2
 Group:         Development/Libraries
 URL:           http://reality.sgiweb.org/davea/dwarf.html
 
-#md5sum 4e603955797a1d5d314a9489a4342c24 (for 20090324)
 Source0:       http://reality.sgiweb.org/davea/%{name}-%{upstreamid}.tar.gz
 
 # This patch set up the proper soname
@@ -24,6 +23,12 @@ Group:         Development/Libraries
 Requires:      %{name} = %{version}-%{release}
 Requires:      elfutils-libelf
 
+%package static
+Summary:       Static libdwarf library
+License:       LGPLv2
+Group:         Development/Libraries
+Requires:      %{name}-devel = %{version}-%{release}
+
 %package tools
 Summary:       Tools for accessing DWARF debugging information
 License:       GPLv2
@@ -36,6 +41,9 @@ Library to access the DWARF debugging fi
 source level debugging of a number of procedural languages, such as C, C++,
 and Fortran.  Please see http://www.dwarfstd.org for DWARF specification.
 
+%description static
+Static libdwarf library.
+
 %description devel
 Development package containing library and header files of libdwarf.
 
@@ -45,12 +53,12 @@ to access DWARF debug information.
 
 %prep
 %setup -q -n dwarf-%{upstreamid}
-%patch0 -p1 -b .soname-fix
+%patch0 -p0 -b .soname-fix
 
 %build
 pushd libdwarf
 %configure --enable-shared
-make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS -I. -fPIC" libdwarf.so.0.0
+make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS -I. -fPIC" libdwarf.so.0.0 libdwarf.a 
 ln -s libdwarf.so.0.0 libdwarf.so
 ln -s libdwarf.so.0.0 libdwarf.so.0
 popd
@@ -58,11 +66,11 @@ popd
 # Need to also configure dwarfdump since dwarfdump2 Makefile 
 # depends on dwarfdump's Makefile
 pushd dwarfdump
-%configure --enable-shared
+%configure 
 popd
 
 pushd dwarfdump2
-%configure --enable-shared
+%configure 
 # Note: %{?_smp_mflags} failed to build
 LD_LIBRARY_PATH="../libdwarf" make CFLAGS="$RPM_OPT_FLAGS -I. -fPIC" all
 popd
@@ -70,10 +78,12 @@ popd
 %install
 rm -rf %{buildroot}
 install -pDm 0644 libdwarf/dwarf.h         %{buildroot}%{_includedir}/libdwarf/dwarf.h
+install -pDm 0644 libdwarf/libdwarf.a      %{buildroot}%{_libdir}/libdwarf.a
+
 install -pDm 0644 libdwarf/libdwarf.h      %{buildroot}%{_includedir}/libdwarf/libdwarf.h
 install -pDm 0755 libdwarf/libdwarf.so.0.0 %{buildroot}%{_libdir}/libdwarf.so.0.0
-cp -pd libdwarf/libdwarf.so.0               %{buildroot}%{_libdir}/libdwarf.so.0
-cp -pd libdwarf/libdwarf.so                 %{buildroot}%{_libdir}/libdwarf.so
+cp -pd libdwarf/libdwarf.so.0              %{buildroot}%{_libdir}/libdwarf.so.0
+cp -pd libdwarf/libdwarf.so                %{buildroot}%{_libdir}/libdwarf.so
 install -pDm 0755 dwarfdump2/dwarfdump     %{buildroot}%{_bindir}/dwarfdump
 
 %clean
@@ -85,22 +95,29 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc libdwarf/README libdwarf/COPYING libdwarf/LIBDWARFCOPYRIGHT libdwarf/LGPL.txt
+%doc libdwarf/ChangeLog libdwarf/README libdwarf/COPYING libdwarf/LIBDWARFCOPYRIGHT libdwarf/LGPL.txt
 %{_libdir}/libdwarf.so.0*
 
+%files static
+%defattr(-,root,root,-)
+%{_libdir}/libdwarf.a
+
 %files devel
 %defattr(-,root,root,-)
-%doc libdwarf/README libdwarf/COPYING libdwarf/LIBDWARFCOPYRIGHT libdwarf/LGPL.txt
 %doc libdwarf/*.pdf
 %{_includedir}/libdwarf
 %{_libdir}/libdwarf.so
 
 %files tools
 %defattr(-,root,root,-)
-%doc dwarfdump2/README dwarfdump2/COPYING dwarfdump2/DWARFDUMPCOPYRIGHT dwarfdump2/GPL.txt
+%doc dwarfdump2/README dwarfdump2/ChangeLog dwarfdump2/COPYING dwarfdump2/DWARFDUMPCOPYRIGHT dwarfdump2/GPL.txt
 %{_bindir}/dwarfdump
 
 %changelog
+* Tue Jul 06 2010 Parag Nemade <paragn AT fedoraproject.org> - 0.20100629-1
+- Update to 20100629 release
+- Add -static subpackage as request in rh#586807
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.20090324-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libdwarf/F-13/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	1 Apr 2009 16:55:45 -0000	1.2
+++ sources	6 Jul 2010 10:41:01 -0000	1.3
@@ -1 +1 @@
-4e603955797a1d5d314a9489a4342c24  libdwarf-20090324.tar.gz
+38357d311f6a0be595565be9b0e01449  libdwarf-20100629.tar.gz



More information about the scm-commits mailing list