Packman Build Service PMBS

Changes of Revision 3

rsound.spec Changed

@@ -23,7 +23,6 @@
 URL:                https://github.com/Themaister/RSound
 Group:              System/Sound Daemons
 License:            GPL-3.0+
-BuildRoot:          %{_tmppath}/build-%{name}-%{version}
 BuildRequires:      alsa-devel
 BuildRequires:      libao-devel
 BuildRequires:      portaudio-devel
@@ -31,7 +30,7 @@
 BuildRequires:      libpulse-devel
 BuildRequires:      libsamplerate-devel
 BuildRequires:      jack-devel
-BuildRequires:      gcc make glibc-devel pkgconfig
+BuildRequires:      pkgconfig
 Requires:           librsound%{soname} = %{version}
 
 %description
@@ -61,10 +60,7 @@
 This package contains the development environment.
 
 %prep
-%setup -q
-%if %{_lib}==lib64
-%patch1
-%endif
+%autosetup -p1
 
 %build
 ./configure \
@@ -83,15 +79,13 @@
 
 # we want verbose builds
 find . -type f -name Makefile | while read f; do
-    %__sed -i 's|@$(CC)|$(CC)|' "$f"
+    sed -i 's|@$(CC)|$(CC)|' "$f"
 done
 
-##__sed -i '/^CFLAGS = /s/$/ %{optflags}/' src/config.mk
-
-%__make %{?_smp_mflags} CFLAGS="%{optflags} -std=gnu99"
+%make_build CFLAGS="%{optflags} -std=gnu99" libdir=%{_libdir} includedir=%{_includedir} mandir=%{_mandir}
 
 %install
-%makeinstall
+%make_install libdir=%{_libdir} includedir=%{_includedir} mandir=%{_mandir}
 find %{buildroot} -type f -name "*.la" -delete -print
 find %{buildroot} -type f -name "*.a" -delete -print
 
@@ -99,20 +93,18 @@
 %postun -n librsound%{soname} -p /sbin/ldconfig
 
 %files
-%defattr(-,root,root)
-%doc AUTHORS ChangeLog COPYING DOCUMENTATION README
+%doc AUTHORS ChangeLog DOCUMENTATION README
+%license COPYING
 %{_bindir}/rsd
 %{_bindir}/rsdplay
 %doc %{_mandir}/man1/rsd.1*
 %doc %{_mandir}/man1/rsdplay.1*
 
 %files -n librsound%{soname}
-%defattr(-,root,root)
 %{_libdir}/librsound.so.%{soname}
 %{_libdir}/librsound.so.%{soname}.*
 
 %files -n librsound-devel
-%defattr(-,root,root)
 %{_includedir}/rsound.h
 %{_libdir}/librsound.so
 %{_libdir}/pkgconfig/rsound.pc

rsound-lib64.patch Changed

@@ -1,48 +1,56 @@
---- src/Makefile.orig	2012-07-19 20:31:25.576757562 +0200
-+++ src/Makefile	2012-07-19 20:32:41.354754866 +0200
-@@ -17,7 +17,7 @@
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -17,7 +17,7 @@ endif
  TARGET_LIB_OBJ = librsound/librsound.o librsound/buffer.o
  TARGET_LIB_OBJ_STATIC = librsound/librsound.a
  
 -PKGCONF_PATH = $(PREFIX)/lib/pkgconfig/rsound.pc
-+PKGCONF_PATH = $(PREFIX)/lib64/pkgconfig/rsound.pc
++PKGCONF_PATH = $(libdir)/pkgconfig
  
  TARGET_SERVER_LIBS = -lpthread
  TARGET_LIB_LIBS = -lpthread
-@@ -164,14 +164,14 @@
+@@ -164,16 +164,16 @@ install: install-lib install-server inst
  
  
  install-lib: $(TARGET_LIB) $(TARGET_LIB_OBJ_STATIC) install-pkgconf
 -	mkdir -p $(DESTDIR)$(PREFIX)/{lib/pkgconfig,include,share/man/man1}
 -	install -m755 $(TARGET_LIB) $(DESTDIR)$(PREFIX)/lib
-+	mkdir -p $(DESTDIR)$(PREFIX)/{lib64/pkgconfig,include,share/man/man1}
-+	install -m755 $(TARGET_LIB) $(DESTDIR)$(PREFIX)/lib64
++	mkdir -vp $(DESTDIR)$(PKGCONF_PATH) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir) $(DESTDIR)$(mandir)/man1
++	install -m755 $(TARGET_LIB) $(DESTDIR)$(libdir)
  ifneq ($(PLATFORM),OSX)
 -	cp -P librsound/librsound.so librsound/librsound.so.3 $(DESTDIR)$(PREFIX)/lib
-+	cp -P librsound/librsound.so librsound/librsound.so.3 $(DESTDIR)$(PREFIX)/lib64
++	cp -P librsound/librsound.so librsound/librsound.so.3 $(DESTDIR)$(libdir)
  endif
 -	install -m644 $(TARGET_LIB_OBJ_STATIC) $(DESTDIR)$(PREFIX)/lib
-+	install -m644 $(TARGET_LIB_OBJ_STATIC) $(DESTDIR)$(PREFIX)/lib64
- 	install -m644 librsound/rsound.h $(DESTDIR)$(PREFIX)/include
+-	install -m644 librsound/rsound.h $(DESTDIR)$(PREFIX)/include
 -	install -m644 rsound.pc $(DESTDIR)$(PREFIX)/lib/pkgconfig
-+	install -m644 rsound.pc $(DESTDIR)$(PREFIX)/lib64/pkgconfig
- 	install -m644 ../doc/rsd.1 $(DESTDIR)$(PREFIX)/share/man/man1
- 	install -m644 ../doc/rsdplay.1 $(DESTDIR)$(PREFIX)/share/man/man1
+-	install -m644 ../doc/rsd.1 $(DESTDIR)$(PREFIX)/share/man/man1
+-	install -m644 ../doc/rsdplay.1 $(DESTDIR)$(PREFIX)/share/man/man1
++	install -m644 $(TARGET_LIB_OBJ_STATIC) $(DESTDIR)$(libdir)
++	install -m644 librsound/rsound.h $(DESTDIR)$(includedir)
++	install -m644 rsound.pc $(DESTDIR)$(PKGCONF_PATH)
++	install -m644 ../doc/rsd.1 $(DESTDIR)$(mandir)/man1
++	install -m644 ../doc/rsdplay.1 $(DESTDIR)$(mandir)/man1
  
-@@ -186,14 +186,14 @@
+ install-server: $(TARGET_SERVER)
+ 	mkdir -p $(DESTDIR)$(PREFIX)/bin
+@@ -186,15 +186,15 @@ install-client: $(TARGET_CLIENT)
  install-pkgconf:
  	@echo "prefix=$(PREFIX)" > rsound.pc
  	@echo "exec_prefix=\$${prefix}" >> rsound.pc
 -	@echo "libdir=\$${prefix}/lib" >> rsound.pc
-+	@echo "libdir=\$${prefix}/lib64" >> rsound.pc
- 	@echo "includedir=\$${prefix}/include" >> rsound.pc
+-	@echo "includedir=\$${prefix}/include" >> rsound.pc
++	@echo "libdir=$(libdir)" >> rsound.pc
++	@echo "includedir=$(includedir)" >> rsound.pc
  	@echo "" >> rsound.pc
  	@echo "Name: RSound" >> rsound.pc
  	@echo "Description: An audio library designed for seamless networked transfer of audio streams." >> rsound.pc
  	@echo "Requires:" >> rsound.pc
  	@echo "Version: $(RSD_VERSION)" >> rsound.pc
 -	@echo "Libs: -L\$${prefix}/lib -lrsound" >> rsound.pc
-+	@echo "Libs: -L\$${prefix}/lib64 -lrsound" >> rsound.pc
- 	@echo "Cflags: -I\$${prefix}/include" >> rsound.pc
+-	@echo "Cflags: -I\$${prefix}/include" >> rsound.pc
++	@echo "Libs: -L$(libdir) -lrsound" >> rsound.pc
++	@echo "Cflags: -I$(includedir)" >> rsound.pc
  
  uninstall:
+ 	rm -rf $(PREFIX)/bin/rsd