Merge history for Fedora and EPEL

.gitignore

@@ -1,3 +1 @@
-/protobuf-c-0.15.tar.gz
-/protobuf-c-1.0.0.tar.gz
-/protobuf-c-1.0.1.tar.gz
+/protobuf-c-*.tar.gz

protobuf-c.spec

@@ -1,5 +1,5 @@
 Name:           protobuf-c
-Version:        1.0.1
+Version:        1.2.1
 Release:        1%{?dist}
 Summary:        C bindings for Google's Protocol Buffers
 
@@ -18,10 +18,20 @@ libraries to use Protocol Buffers from pure C (not C++).
 
 It uses a modified version of protoc called protoc-c. 
 
+%package compiler
+Summary: Protocol Buffers C compiler
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+
+%description compiler
+This package contains a modified version of the Protocol Buffers
+compiler for the C programming language called protoc-c.
+
 %package devel
 Summary:        Protocol Buffers C headers and libraries
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
+Requires:       %{name}-compiler = %{version}-%{release}
 
 %description devel
 This package contains protobuf-c headers and libraries.
@@ -46,10 +56,13 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/libprotobuf-c.la
 
 %files
 %defattr(-,root,root,-)
-%{_bindir}/protoc-c
 %{_libdir}/libprotobuf-c.so.*
 %doc TODO LICENSE ChangeLog
 
+%files compiler
+%defattr(-,root,root,-)
+%{_bindir}/protoc-c
+
 %files devel
 %defattr(-,root,root,-)
 %dir %{_includedir}/google
@@ -58,7 +71,33 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/libprotobuf-c.la
 %{_libdir}/libprotobuf-c.so
 %{_libdir}/pkgconfig/libprotobuf-c.pc
 
+
 %changelog
+* Sun Mar 27 2016 Jan Vcelak <jvcelak@fedoraproject.org> 1.2.1-1
+- New upstream release:
+  + fix: negative value packing
+  + fix: eliminate undefined behavior in zigzag functions
+  + fix: generate code that uses universal zero initializer for oneof unions
+
+* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Wed Nov 25 2015 Nikos Mavrogiannopoulos <nmav@redhat.com> - 1.1.1-3
+- Added protobuf-c-compiler subpackage to reduce runtime
+
+* Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Thu Apr 23 2015 Nikos Mavrogiannopoulos <nmav@redhat.com> - 1.1.1-1
+- new upstream release (#1142988)
+
+* Sat Feb 21 2015 Till Maas <opensource@till.name> - 1.0.1-3
+- Rebuilt for Fedora 23 Change
+  https://fedoraproject.org/wiki/Changes/Harden_all_packages_with_position-independent_code
+
+* Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
 * Wed Aug 06 2014 Nikos Mavrogiannopoulos <nmav@redhat.com> - 1.0.1-1
 - new upstream release
 

sources

@@ -1 +1 @@
-59f907992a791815c479e9e1ee9f452c  protobuf-c-1.0.1.tar.gz
+e544249c329391fff512c3874895cfbe  protobuf-c-1.2.1.tar.gz