7:04 a.m.
Author: konradm
Update of /cvs/nonfree/rpms/unrar/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv23247
Modified Files:
.cvsignore sources unrar-4.2.3-fix-build.patch unrar.spec
Log Message:
* Sun Dec 30 2012 Conrad Meyer <konrad(a)tylerc.org> - 4.2.4-3
- Try at #2357 again :). Instead of arbitrary date, use rpm %version
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/unrar/F-18/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore 3 Jun 2012 21:14:44 -0000 1.9
+++ .cvsignore 3 Jan 2013 07:04:15 -0000 1.10
@@ -1 +1 @@
-unrarsrc-4.2.3.tar.gz
+unrarsrc-4.2.4.tar.gz
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/unrar/F-18/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources 3 Jun 2012 21:14:44 -0000 1.9
+++ sources 3 Jan 2013 07:04:16 -0000 1.10
@@ -1 +1 @@
-6c6c778dc08246065c89f67fe06a7134 unrarsrc-4.2.3.tar.gz
+8ea9d1b4139474b282d76e627a2de3e4 unrarsrc-4.2.4.tar.gz
unrar-4.2.3-fix-build.patch:
makefile.unix | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
Index: unrar-4.2.3-fix-build.patch
===================================================================
RCS file: /cvs/nonfree/rpms/unrar/F-18/unrar-4.2.3-fix-build.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- unrar-4.2.3-fix-build.patch 3 Jun 2012 21:14:44 -0000 1.1
+++ unrar-4.2.3-fix-build.patch 3 Jan 2013 07:04:16 -0000 1.2
@@ -1,14 +1,29 @@
---- unrar/makefile.unix.orig 2012-05-15 02:31:03.000000000 -0300
-+++ unrar/makefile.unix 2012-05-28 11:52:22.544857061 -0300
-@@ -117 +117 @@
+--- unrar/makefile.unix.orig 2012-12-30 14:05:10.517876487 -0800
++++ unrar/makefile.unix 2012-12-30 14:05:10.519876460 -0800
+@@ -114,22 +114,22 @@
+ uninstall: uninstall-unrar
+
+ clean:
- @rm -f *.o *.bak *~
+ @rm -f *.o *.bak *~ unrar
-@@ -119 +119 @@
+
-unrar: clean $(OBJECTS) $(UNRAR_OBJ)
+unrar: $(OBJECTS) $(UNRAR_OBJ)
-@@ -125 +125 @@
+ @rm -f unrar
+ $(LINK) -o unrar $(LDFLAGS) $(OBJECTS) $(UNRAR_OBJ) $(LIBS)
+ $(STRIP) unrar
+
+ sfx: WHAT=SFX_MODULE
-sfx: clean $(OBJECTS)
+sfx: $(OBJECTS)
-@@ -132 +132 @@
+ @rm -f default.sfx
+ $(LINK) -o default.sfx $(LDFLAGS) $(OBJECTS)
+ $(STRIP) default.sfx
+
+ lib: WHAT=RARDLL
+ lib: CXXFLAGS+=$(LIBFLAGS)
-lib: clean $(OBJECTS) $(LIB_OBJ)
+lib: $(OBJECTS) $(LIB_OBJ)
+ @rm -f libunrar.so
+ $(LINK) -shared -o libunrar.so $(LDFLAGS) $(OBJECTS) $(LIB_OBJ)
+
Index: unrar.spec
===================================================================
RCS file: /cvs/nonfree/rpms/unrar/F-18/unrar.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- unrar.spec 3 Jun 2012 21:14:44 -0000 1.23
+++ unrar.spec 3 Jan 2013 07:04:16 -0000 1.24
@@ -1,6 +1,6 @@
Name: unrar
-Version: 4.2.3
-Release: 1%{?dist}
+Version: 4.2.4
+Release: 3%{?dist}
Summary: Utility for extracting, testing and viewing RAR archives
License: Freeware with further limitations
Group: Applications/Archiving
@@ -12,6 +12,7 @@
Patch0: unrar-3.9.10-missing-recvol-symbols.patch
Patch1: unrar-4.2.3-fix-build.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
Requires(post): chkconfig
Requires(preun): chkconfig
@@ -26,6 +27,9 @@
Summary: Decompress library for RAR v3 archives
Group: System Environment/Libraries
+# Packages using libunrar must Requires this:
+#{?unrar_version:Requires: libunrar%{_isa} = %{unrar_version}}
+
%description -n libunrar
The libunrar library allows programs linking against it to decompress
existing RAR v3 archives.
@@ -69,6 +73,13 @@
# handle alternatives
touch %{buildroot}%{_bindir}/unrar
+# RPM Macros support
+mkdir -p %{buildroot}%{_sysconfdir}/rpm
+cat > %{buildroot}%{_sysconfdir}/rpm/macros.unrar << EOF
+# unrar RPM Macros
+%unrar_version %{version}
+EOF
+touch -r license.txt %{buildroot}%{_sysconfdir}/rpm/macros.unrar
%clean
@@ -108,10 +119,22 @@
%files -n libunrar-devel
%defattr(-,root,root,-)
%doc license.txt readme.txt
+%config %{_sysconfdir}/rpm/macros.unrar
%{_includedir}/*
%changelog
+* Sun Dec 30 2012 Conrad Meyer <konrad(a)tylerc.org> - 4.2.4-3
+- Try at #2357 again :). Instead of arbitrary date, use rpm %%version
+
+* Sun Dec 30 2012 Conrad Meyer <konrad(a)tylerc.org> - 4.2.4-2
+- Add RPM dependency check to ensure dependent packages break at install time
+ rather than use time (#2357) (derived from live555 package)
+
+* Sun Dec 30 2012 Conrad Meyer <konrad(a)tylerc.org> - 4.2.4-1
+- Bump version (#2508)
+- Fix unrar-4.2.3-fix-build.patch diff to have context
+
* Thu May 28 2012 Marcos Mello <marcosfrm AT gmail DOT com> - 4.2.3-1
- New version
- Include all header files in the -devel package (#1988)