rpms/udev/devel udev-089-nopie.patch,1.5,1.6 udev.spec,1.166,1.167

[fedora-cvs-commits at redhat.com]

Author: harald

Update of /cvs/dist/rpms/udev/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8774

Modified Files:
	udev-089-nopie.patch udev.spec 
Log Message:
- added subpackages libvolume_id and libvolume_id-devel


udev-089-nopie.patch:
 Makefile |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

Index: udev-089-nopie.patch
===================================================================
RCS file: /cvs/dist/rpms/udev/devel/udev-089-nopie.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- udev-089-nopie.patch	13 Apr 2006 12:37:35 -0000	1.5
+++ udev-089-nopie.patch	3 May 2006 15:54:21 -0000	1.6
@@ -1,56 +1,20 @@
---- udev-089/extras/volume_id/lib/Makefile.nopie	2006-04-03 14:41:10.000000000 +0200
-+++ udev-089/extras/volume_id/lib/Makefile	2006-04-13 14:36:08.000000000 +0200
-@@ -54,7 +54,7 @@
- 	libvolume_id.h		\
- 	util.h
+--- udev-091/extras/volume_id/lib/Makefile.nopie	2006-04-25 22:39:59.000000000 +0200
++++ udev-091/extras/volume_id/lib/Makefile	2006-05-03 16:23:33.000000000 +0200
+@@ -67,7 +67,7 @@
  
--all: libvolume_id.a $(SHLIB) libvolume_id.pc
-+all: libvolume_id.a 
- .PHONY: all
- .DEFAULT: all
- 
-@@ -65,9 +65,10 @@
- .shlib:
- 	$(Q) mkdir .shlib
- 
-+SHCFLAGS:=$(shell echo $(CFLAGS) -fpic -fPIC|sed -e 's/-pie//g')
-+
  .shlib/%.o: %.c
--	$(E) "  CC      " $@
+ 	$(E) "  CC      " $@
 -	$(Q) $(CC) -c $(CFLAGS) -fPIC $< -o $@
-+	$(CC) -c $(SHCFLAGS)  $< -o $@
++	$(Q) $(subst -fpie,,$(subst -pie,,$(CC) )) -c $(CFLAGS) -fPIC $< -o $@
  
  libvolume_id.a: $(HEADERS) $(OBJS)
  	$(Q) rm -f $@
-@@ -76,9 +77,11 @@
- 	$(E) "  RANLIB  " $@
- 	$(Q) $(RANLIB) $@
+@@ -78,7 +78,7 @@
  
-+SHLIBFLAGS:=$(shell echo $(LDFLAGS) $(CFLAGS) -fpic -fPIC|sed -e 's/-pie//g')
-+
  $(SHLIB): $(HEADERS) .shlib $(addprefix .shlib/,$(OBJS))
  	$(E) "  CC      " $@
 -	$(Q) $(CC) -shared $(CFLAGS) -o $@ \
-+	$(LD) $(SHLIBFLAGS) -shared -o $@ \
++	$(Q) $(subst -fpie,,$(subst -pie,,$(CC) )) -shared $(CFLAGS) -o $@ \
  		-Wl,-soname,libvolume_id.so.$(SHLIB_CUR),--version-script,exported_symbols \
  		$(addprefix .shlib/,$(OBJS))
  	$(Q) ln -sf $@ libvolume_id.so.$(SHLIB_CUR)
-@@ -97,12 +100,12 @@
- 	$(Q) echo "Cflags: -I\$${includedir}" >> $@
- 
- install: all
--	$(INSTALL_DATA) -D libvolume_id.h $(DESTDIR)$(includedir)/libvolume_id.h
--	$(INSTALL_LIB) -D libvolume_id.a $(DESTDIR)$(usrlibdir)/libvolume_id.a
--	$(INSTALL_LIB) -D $(SHLIB) $(DESTDIR)$(libdir)/$(SHLIB)
--	ln -sf $(SHLIB) $(DESTDIR)$(libdir)/libvolume_id.so.$(SHLIB_CUR)
--	ln -sf $(libdir)/$(SHLIB) $(DESTDIR)$(usrlibdir)/libvolume_id.so
--	$(INSTALL_DATA) -D libvolume_id.pc $(DESTDIR)$(usrlibdir)/pkgconfig/libvolume_id.pc
-+	#$(INSTALL_DATA) -D libvolume_id.h $(DESTDIR)$(includedir)/libvolume_id.h
-+	#$(INSTALL_LIB) -D libvolume_id.a $(DESTDIR)$(usrlibdir)/libvolume_id.a
-+	#$(INSTALL_LIB) -D $(SHLIB) $(DESTDIR)$(libdir)/$(SHLIB)
-+	#ln -sf $(SHLIB) $(DESTDIR)$(libdir)/libvolume_id.so.$(SHLIB_CUR)
-+	#ln -sf $(libdir)/$(SHLIB) $(DESTDIR)$(usrlibdir)/libvolume_id.so
-+	#$(INSTALL_DATA) -D libvolume_id.pc $(DESTDIR)$(usrlibdir)/pkgconfig/libvolume_id.pc
- .PHONY: install
- 
- uninstall:


Index: udev.spec
===================================================================
RCS file: /cvs/dist/rpms/udev/devel/udev.spec,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -r1.166 -r1.167
--- udev.spec	3 May 2006 11:20:16 -0000	1.166
+++ udev.spec	3 May 2006 15:54:21 -0000	1.167
@@ -5,7 +5,7 @@
 Summary: A userspace implementation of devfs
 Name: udev
 Version: 091
-Release: 1
+Release: 2
 License: GPL
 Group: System Environment/Base
 Provides: udev-persistent = 0:%{version}-%{release}
@@ -41,6 +41,23 @@
 The udev package contains an implementation of devfs in 
 userspace using sysfs and netlink.
 
+%package -n libvolume_id-devel
+Summary: Static libraries and headers for libvolume_id
+Group: Development/Libraries
+Requires: libvolume_id = %{version}-%{release}
+
+%description -n libvolume_id-devel
+This package contains libraries and include files, 
+which needed to link against libvolume_id.
+
+%package -n libvolume_id
+Summary: Dynamic libraries to get volume ids
+Group: System Environment/Libraries
+
+%description -n libvolume_id
+This package contains the libvolume_id.so dynamic library,
+which contains functions to get volume ids.
+
 %prep
 %setup -q  
 %patch1 -p1 -b .rhpermconv
@@ -106,7 +123,7 @@
 	"
         #extras/volume_id  
 
-%{__cc} %{optflags} -o firmware_helper %{SOURCE10}
+%{__cc} %{optflags} -fpie -pie -o firmware_helper %{SOURCE10}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -124,7 +141,7 @@
 mv extras/volume_id/vol_id.static extras/volume_id/vol_id
 touch extras/volume_id/vol_id
 
-make DESTDIR=$RPM_BUILD_ROOT install \
+make DESTDIR=$RPM_BUILD_ROOT CC="gcc $RPM_OPT_FLAGS -fpie -pie" LDFLAGS="-pie" install \
 	EXTRAS="	\
 	extras/scsi_id	\
         extras/ata_id \
@@ -178,14 +195,6 @@
 
 mkdir -p -m 0755 $RPM_BUILD_ROOT/lib/firmware
 
-pushd $RPM_BUILD_ROOT
-rm -f usr/include/libvolume_id.h \
-   usr/lib*/libvolume_id.a \
-   usr/lib*/libvolume_id.so \
-   usr/lib*/pkgconfig/libvolume_id.pc \
-   lib*/libvolume_id.*
-popd
-
 # short-term workaround
 mkdir -p $RPM_BUILD_ROOT/etc/sysconfig/modules
 cat >$RPM_BUILD_ROOT/etc/sysconfig/modules/udev-stw.modules <<EOF
@@ -303,7 +312,20 @@
 %attr(0644,root,root) %{_mandir}/man8/edd_id*.8*
 %attr(0644,root,root) %{_mandir}/man8/vol_id*.8*
 
+%files -n libvolume_id
+%attr(755,root,root) /%{_lib}/libvolume_id.so.*
+
+%files -n libvolume_id-devel
+%defattr(0644, root, root, 0755)
+%{_includedir}/libvolume_id.h 
+%{_libdir}/libvolume_id.a 
+%{_libdir}/libvolume_id.so
+%{_libdir}/pkgconfig/libvolume_id.pc 
+
 %changelog
+* Wed May 03 2006 Harald Hoyer <harald at redhat.com> - 091-2
+- added subpackages libvolume_id and libvolume_id-devel
+
 * Wed May 03 2006 Harald Hoyer <harald at redhat.com> - 091-1
 - version 091