rpms/swftools/F-15 swftools-0.9.2-install.patch, NONE, 1.1 swftools-0.9.2-prefix.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 swftools.spec, 1.1, 1.2

Mohamed ElMorabity melmorabity at rpmfusion.org
Tue Apr 10 16:30:54 CEST 2012 

Author: melmorabity

Update of /cvs/free/rpms/swftools/F-15
In directory se02.es.rpmfusion.net:/tmp/cvs-serv6632

Modified Files:
	.cvsignore sources swftools.spec 
Added Files:
	swftools-0.9.2-install.patch swftools-0.9.2-prefix.patch 
Log Message:
* Tue Apr 10 2012 Mohamed El Morabity <melmorabity at fedoraproject.org> - 0.9.2-1
- Update to 0.9.2


swftools-0.9.2-install.patch:
 Makefile.in |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

--- NEW FILE swftools-0.9.2-install.patch ---
diff -up swftools-0.9.2/swfs/Makefile.in.orig swftools-0.9.2/swfs/Makefile.in
--- swftools-0.9.2/swfs/Makefile.in.orig	2012-04-10 14:19:33.650083642 +0200
+++ swftools-0.9.2/swfs/Makefile.in	2012-04-10 15:32:27.209976521 +0200
@@ -41,10 +41,8 @@ install:
 	$(INSTALL_DATA) ./PreLoaderTemplate.swf $(DESTDIR)/$(pkgdatadir)/swfs/PreLoaderTemplate.swf
 	$(INSTALL_DATA) ./tessel_loader.swf $(DESTDIR)/$(pkgdatadir)/swfs/tessel_loader.swf
 	$(INSTALL_DATA) ./swft_loader.swf $(DESTDIR)/$(pkgdatadir)/swfs/swft_loader.swf
-	rm -f $(DESTDIR)/$(pkgdatadir)/swfs/default_viewer.swf -o -L $(DESTDIR)/$(pkgdatadir)/swfs/default_viewer.swf
-	$(LN_S) $(DESTDIR)/$(pkgdatadir)/swfs/simple_viewer.swf $(DESTDIR)/$(pkgdatadir)/swfs/default_viewer.swf
-	rm -f $(DESTDIR)/$(pkgdatadir)/swfs/default_loader.swf -o -L $(DESTDIR)/$(pkgdatadir)/swfs/default_loader.swf
-	$(LN_S) $(DESTDIR)/$(pkgdatadir)/swfs/tessel_loader.swf $(DESTDIR)/$(pkgdatadir)/swfs/default_loader.swf
+	$(LN_S) simple_viewer.swf $(DESTDIR)/$(pkgdatadir)/swfs/default_viewer.swf
+	$(LN_S) tessel_loader.swf $(DESTDIR)/$(pkgdatadir)/swfs/default_loader.swf
 		
 uninstall:
 	$(UNINSTALL_DATA) $(DESTDIR)/$(pkgdatadir)/swfs/simple_viewer.swf

swftools-0.9.2-prefix.patch:
 Makefile.common.in |    8 ++++----
 src/Makefile.in    |    4 ++--
 swfs/Makefile.in   |   36 ++++++++++++++++++------------------
 3 files changed, 24 insertions(+), 24 deletions(-)

--- NEW FILE swftools-0.9.2-prefix.patch ---
diff -up swftools-0.9.2/Makefile.common.in.orig swftools-0.9.2/Makefile.common.in
--- swftools-0.9.2/Makefile.common.in.orig	2010-11-12 20:06:53.000000000 +0100
+++ swftools-0.9.2/Makefile.common.in	2012-04-10 14:31:30.144948230 +0200
@@ -69,10 +69,10 @@ man1dir = $(mandir)/man1
 
 # ------------------- defines -------------------------
 
-INSTALL_BIN = echo installing $$file to $(bindir);$(INSTALL_PROGRAM) $$file $(bindir)/`echo $$file|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`
-UNINSTALL_BIN = ff=`echo $$file|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`;echo rm -f $(bindir)/$$ff;rm -f $(bindir)/$$ff
-INSTALL_MAN1 = ff=$(srcdir)/$$file.1; inst=`echo $$file | sed '$(transform)'`.1; echo "$(INSTALL_DATA) $$ff $(man1dir)/$$inst"; $(INSTALL_DATA) $$ff $(man1dir)/$$inst
-UNINSTALL_MAN1 = ff=$(srcdir)/$$file.1; inst=`echo $$file | sed '$(transform)'`.1; echo "rm -f $(man1dir)/$$inst"; rm -f $(man1dir)/$$inst
+INSTALL_BIN = echo installing $$file to $(DESTDIR)/$(bindir);$(INSTALL_PROGRAM) $$file $(DESTDIR)/$(bindir)/`echo $$file|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`
+UNINSTALL_BIN = ff=`echo $$file|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`;echo rm -f $(DESTDIR)/$(bindir)/$$ff;rm -f $(DESTDIR)/$(bindir)/$$ff
+INSTALL_MAN1 = ff=$(srcdir)/$$file.1; inst=`echo $$file | sed '$(transform)'`.1; echo "$(INSTALL_DATA) $$ff $(DESTDIR)/$(man1dir)/$$inst"; $(INSTALL_DATA) $$ff $(DESTDIR)/$(man1dir)/$$inst
+UNINSTALL_MAN1 = ff=$(srcdir)/$$file.1; inst=`echo $$file | sed '$(transform)'`.1; echo "rm -f $(DESTDIR)/$(man1dir)/$$inst"; rm -f $(DESTDIR)/$(man1dir)/$$inst
 
 #%.o: %.c
 #	$(C) $< -o $@
diff -up swftools-0.9.2/src/Makefile.in.orig swftools-0.9.2/src/Makefile.in
--- swftools-0.9.2/src/Makefile.in.orig	2011-10-07 05:20:17.000000000 +0200
+++ swftools-0.9.2/src/Makefile.in	2012-04-10 14:31:37.803625994 +0200
@@ -134,8 +134,8 @@ swfc$(E): parser.$(O) swfc.$(O) swfc-fee
 	$(STRIP) $@
 
 install:
-	$(mkinstalldirs) $(bindir)
-	$(mkinstalldirs) $(man1dir)
+	$(mkinstalldirs) $(DESTDIR)/$(bindir)
+	$(mkinstalldirs) $(DESTDIR)/$(man1dir)
 	@for file in $(install_programs); do if test -f $$file;then $(INSTALL_BIN);$(INSTALL_MAN1);fi;done
 	
 uninstall:
diff -up swftools-0.9.2/swfs/Makefile.in.orig swftools-0.9.2/swfs/Makefile.in
--- swftools-0.9.2/swfs/Makefile.in.orig	2012-04-08 19:25:26.000000000 +0200
+++ swftools-0.9.2/swfs/Makefile.in	2012-04-10 14:19:33.650083642 +0200
@@ -34,26 +34,26 @@ PreLoaderTemplate.swf: $(programs)
 	./PreLoaderTemplate$(E) || true
 
 install:
-	$(mkinstalldirs) $(pkgdatadir)
-	$(mkinstalldirs) $(pkgdatadir)/swfs
-	$(INSTALL_DATA) ./simple_viewer.swf $(pkgdatadir)/swfs/simple_viewer.swf
-	$(INSTALL_DATA) ./keyboard_viewer.swf $(pkgdatadir)/swfs/keyboard_viewer.swf
-	$(INSTALL_DATA) ./PreLoaderTemplate.swf $(pkgdatadir)/swfs/PreLoaderTemplate.swf
-	$(INSTALL_DATA) ./tessel_loader.swf $(pkgdatadir)/swfs/tessel_loader.swf
-	$(INSTALL_DATA) ./swft_loader.swf $(pkgdatadir)/swfs/swft_loader.swf
-	rm -f $(pkgdatadir)/swfs/default_viewer.swf -o -L $(pkgdatadir)/swfs/default_viewer.swf
-	$(LN_S) $(pkgdatadir)/swfs/simple_viewer.swf $(pkgdatadir)/swfs/default_viewer.swf
-	rm -f $(pkgdatadir)/swfs/default_loader.swf -o -L $(pkgdatadir)/swfs/default_loader.swf
-	$(LN_S) $(pkgdatadir)/swfs/tessel_loader.swf $(pkgdatadir)/swfs/default_loader.swf
+	$(mkinstalldirs) $(DESTDIR)/$(pkgdatadir)
+	$(mkinstalldirs) $(DESTDIR)/$(pkgdatadir)/swfs
+	$(INSTALL_DATA) ./simple_viewer.swf $(DESTDIR)/$(pkgdatadir)/swfs/simple_viewer.swf
+	$(INSTALL_DATA) ./keyboard_viewer.swf $(DESTDIR)/$(pkgdatadir)/swfs/keyboard_viewer.swf
+	$(INSTALL_DATA) ./PreLoaderTemplate.swf $(DESTDIR)/$(pkgdatadir)/swfs/PreLoaderTemplate.swf
+	$(INSTALL_DATA) ./tessel_loader.swf $(DESTDIR)/$(pkgdatadir)/swfs/tessel_loader.swf
+	$(INSTALL_DATA) ./swft_loader.swf $(DESTDIR)/$(pkgdatadir)/swfs/swft_loader.swf
+	rm -f $(DESTDIR)/$(pkgdatadir)/swfs/default_viewer.swf -o -L $(DESTDIR)/$(pkgdatadir)/swfs/default_viewer.swf
+	$(LN_S) $(DESTDIR)/$(pkgdatadir)/swfs/simple_viewer.swf $(DESTDIR)/$(pkgdatadir)/swfs/default_viewer.swf
+	rm -f $(DESTDIR)/$(pkgdatadir)/swfs/default_loader.swf -o -L $(DESTDIR)/$(pkgdatadir)/swfs/default_loader.swf
+	$(LN_S) $(DESTDIR)/$(pkgdatadir)/swfs/tessel_loader.swf $(DESTDIR)/$(pkgdatadir)/swfs/default_loader.swf
 		
 uninstall:
-	$(UNINSTALL_DATA) $(pkgdatadir)/swfs/simple_viewer.swf
-	$(UNINSTALL_DATA) $(pkgdatadir)/swfs/keyboard_viewer.swf
-	$(UNINSTALL_DATA) $(pkgdatadir)/swfs/PreLoaderTemplate.swf
-	$(UNINSTALL_DATA) $(pkgdatadir)/swfs/tessel_loader.swf
-	$(UNINSTALL_DATA) $(pkgdatadir)/swfs/swft_loader.swf
-	$(UNINSTALL_DATA) $(pkgdatadir)/swfs/default_viewer.swf
-	$(UNINSTALL_DATA) $(pkgdatadir)/swfs/default_loader.swf
+	$(UNINSTALL_DATA) $(DESTDIR)/$(pkgdatadir)/swfs/simple_viewer.swf
+	$(UNINSTALL_DATA) $(DESTDIR)/$(pkgdatadir)/swfs/keyboard_viewer.swf
+	$(UNINSTALL_DATA) $(DESTDIR)/$(pkgdatadir)/swfs/PreLoaderTemplate.swf
+	$(UNINSTALL_DATA) $(DESTDIR)/$(pkgdatadir)/swfs/tessel_loader.swf
+	$(UNINSTALL_DATA) $(DESTDIR)/$(pkgdatadir)/swfs/swft_loader.swf
+	$(UNINSTALL_DATA) $(DESTDIR)/$(pkgdatadir)/swfs/default_viewer.swf
+	$(UNINSTALL_DATA) $(DESTDIR)/$(pkgdatadir)/swfs/default_loader.swf
 
 clean: 
 	rm -f *.o *.obj *.lo *.a *.lib *.la gmon.out 


Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/swftools/F-15/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	25 Jan 2012 00:48:18 -0000	1.2
+++ .cvsignore	10 Apr 2012 14:30:54 -0000	1.3
@@ -1 +1 @@
-swftools-0.9.1.tar.gz
+swftools-0.9.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/free/rpms/swftools/F-15/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	25 Jan 2012 00:48:18 -0000	1.2
+++ sources	10 Apr 2012 14:30:54 -0000	1.3
@@ -1 +1 @@
-72dc4a7bf5cdf98c28f9cf9b1d8f5d7a  swftools-0.9.1.tar.gz
+1055ebbe3b4cadcc71e83775a5a0906d  swftools-0.9.2.tar.gz


Index: swftools.spec
===================================================================
RCS file: /cvs/free/rpms/swftools/F-15/swftools.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- swftools.spec	25 Jan 2012 00:48:18 -0000	1.1
+++ swftools.spec	10 Apr 2012 14:30:54 -0000	1.2
@@ -5,8 +5,8 @@
 }
 
 Name:           swftools
-Version:        0.9.1
-Release:        5%{?dist}
+Version:        0.9.2
+Release:        1%{?dist}
 Summary:        SWF manipulation and generation utilities
 
 Group:          Applications/Multimedia
@@ -16,7 +16,9 @@
 URL:            http://www.swftools.org/
 Source0:        http://www.swftools.org/%{name}-%{version}.tar.gz
 # Add prefix to installation paths
-Patch0:         swftools-0.9.1-prefix.patch
+Patch0:         swftools-0.9.2-prefix.patch
+# Fix installation
+Patch1:         swftools-0.9.2-install.patch
 
 BuildRequires:  fftw-devel
 BuildRequires:  fontconfig-devel
@@ -44,6 +46,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .prefix
+%patch1 -p1 -b .install
 
 # Fix permissions
 chmod -x lib/*.[ch] lib/action/*.[ch]
@@ -84,6 +87,9 @@
 
 
 %changelog
+* Tue Apr 10 2012 Mohamed El Morabity <melmorabity at fedoraproject.org> - 0.9.2-1
+- Update to 0.9.2
+
 * Tue Jan 24 2012 Mohamed El Morabity <melmorabity at fedoraproject.org> - 0.9.1-5
 - Fix License tag

More information about the rpmfusion-commits mailing list