public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
To: git-commits@fedoraproject.org
Subject: [rpms/setup] update_services: conflict with filesystems before usrmove change
Date: Mon, 22 Jun 2026 15:55:32 GMT	[thread overview]
Message-ID: <178214373230.1.8684346976547717309.rpms-setup-790dc9a26598@fedoraproject.org> (raw)

A new commit has been pushed.

Repo   : rpms/setup
Branch : update_services
Commit : 790dc9a265987aa66627c59c85edac754d5cf91e
Author : Ondřej Vašík <ovasik@redhat.com>
Date   : 2012-02-21T16:36:16+01:00
Stats  : +7/-2 in 3 file(s)
URL    : https://src.fedoraproject.org/rpms/setup/c/790dc9a265987aa66627c59c85edac754d5cf91e?branch=update_services

Log:
conflict with filesystems before usrmove change

---
diff --git a/.gitignore b/.gitignore
index f5e7b28..6af2739 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,3 +22,4 @@ setup-2.8.25.tar.bz2
 /setup-2.8.46.tar.bz2
 /setup-2.8.47.tar.bz2
 /setup-2.8.48.tar.bz2
+/setup-2.8.49.tar.bz2

diff --git a/setup.spec b/setup.spec
index d900c2e..1092370 100644
--- a/setup.spec
+++ b/setup.spec
@@ -1,6 +1,6 @@
 Summary: A set of system configuration and setup files
 Name: setup
-Version: 2.8.48
+Version: 2.8.49
 Release: 1%{?dist}
 License: Public Domain
 Group: System Environment/Base
@@ -11,6 +11,7 @@ BuildRequires: bash tcsh perl
 # RPM runtime check in the buildroot; this ensures we can not install the
 # incompatible setup.rpm on unconverted systems
 Requires: rpmlib(X-CheckUnifiedSystemdir)
+Conflicts: filesystem < 3
 Conflicts: initscripts < 4.26, bash <= 2.0.4-21
 
 %description
@@ -92,6 +93,9 @@ end
 %ghost %verify(not md5 size mtime) %config(noreplace,missingok) /etc/fstab
 
 %changelog
+* Tue Feb 21 2012 Ondrej Vasik <ovasik@redhat.com> 2.8.49-1
+- conflict with filesystems before usrmove change
+
 * Sun Feb 12 2012 Ondrej Vasik <ovasik@redhat.com> 2.8.48-1
 - remove /bin and /sbin from /etc/profile(#789616)
 - require usrmove

diff --git a/sources b/sources
index e32041e..8ef128f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c79941d322eb09000ffe8044eebc0441  setup-2.8.48.tar.bz2
+83114bb3672d7764ee22023562e0f7fc  setup-2.8.49.tar.bz2

                 reply	other threads:[~2026-06-22 15:55 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=178214373230.1.8684346976547717309.rpms-setup-790dc9a26598@fedoraproject.org \
    --to=git-commits@fedoraproject.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox